Changeset 250 for GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

Timestamp:

Aug 27, 2007, 7:41:50 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.5

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c (modified) (3 diffs)

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

@@ -260 +260 @@
         snd_kcontrol_t *master_volume;
 
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         struct gameport gameport;
 #endif
@@ -1194 +1194 @@
 static int snd_sonicvibes_free(sonicvibes_t *sonic)
 {
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         if (sonic->gameport.io)
                 gameport_unregister_port(&sonic->gameport);
@@ -1498 +1498 @@
                 return err;
         }
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
         sonic->gameport.io = sonic->game_port;
         gameport_register_port(&sonic->gameport);