Changeset 224 for GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci_main.c

Timestamp:

Jul 26, 2007, 7:21:09 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.1

File:

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

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci_main.c ¶

@@ -26 +26 @@
 
 #include <sound/driver.h>
-#include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
 #include <sound/core.h>
 #include <sound/control.h>
@@ -38 +40 @@
 #include <sound/asoundef.h>
 #include <sound/mpu401.h>
+
+#include <asm/io.h>
+
 #ifdef TARGET_OS2
 #include <sound/timer.h>
@@ -1316 +1321 @@
 {
         .access =       SNDRV_CTL_ELEM_ACCESS_READ,
-        .iface =                SNDRV_CTL_ELEM_IFACE_PCM,
-        .name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
         .info =         snd_ymfpci_spdif_mask_info,
         .get =          snd_ymfpci_spdif_mask_get,