patch-2.1.122 linux/drivers/sound/trix.c

Next file: linux/drivers/sound/wavfront.c
Previous file: linux/drivers/sound/sequencer.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.121/linux/drivers/sound/trix.c linux/drivers/sound/trix.c
@@ -39,6 +39,8 @@
 
 static int *trix_osp = NULL;
 
+static int mpu = 0;
+
 static unsigned char trix_read(int addr)
 {
 	outb(((unsigned char) addr), 0x390);	/* MT-0002-PC ASIC address */
@@ -445,7 +447,7 @@
 void unload_trix_sb(struct address_info *hw_config)
 {
 #ifdef CONFIG_SBDSP
-	sb_dsp_unload(hw_config);
+	sb_dsp_unload(hw_config, mpu);
 #endif
 }
 
@@ -479,7 +481,6 @@
 struct address_info sb_config;
 struct address_info mpu_config;
 
-static int      mpu = 0;
 static int      sb = 0;
 
 static int      fw_load;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov