Changeset 277 for GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

Timestamp:

Dec 14, 2007, 8:27:04 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.8

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

@@ -34 +34 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/gameport.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -3242 +3243 @@
 }
 
-#if 0 // fixme to be gone?
 static void __devexit snd_intel8x0_joystick_remove(struct pci_dev *pci)
 {
@@ -3258 +3258 @@
     pci_write_config_word(pci, 0xe6, val);
 }
-#endif // fixme to be gone
 
 static struct pci_device_id snd_intel8x0_joystick_ids[] = {
@@ -3279 +3278 @@
         .id_table = snd_intel8x0_joystick_ids,
         .probe = snd_intel8x0_joystick_probe,
+        .remove = __devexit_p(snd_intel8x0_joystick_remove),
 };
+
 static int have_joystick;
 #endif