Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / sound / pci / ca0106 / ca0106_main.c

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6ed7c0bfa091c3c3790a48cb1e4cf3fe458c4b02..fd8bfebfbd541a846a20c908182406e0ce098437 100644 (file)
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -199,7 +199,8 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
           .name   = "MSI K8N Diamond MB [SB0438]",
           .gpio_type = 1,
           .i2c_adc = 1 } ,
-        /* Shuttle XPC SD31P which has an onboard Creative Labs Sound Blaster Live! 24-bit EAX
+        /* Shuttle XPC SD31P which has an onboard Creative Labs
+         * Sound Blaster Live! 24-bit EAX
          * high-definition 7.1 audio processor".
          * Added using info from andrewvegan in alsa bug #1298
          */
@@ -207,6 +208,15 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
           .name   = "Shuttle XPC SD31P [SD31P]",
           .gpio_type = 1,
           .i2c_adc = 1 } ,
+       /* Shuttle XPC SD11G5 which has an onboard Creative Labs
+        * Sound Blaster Live! 24-bit EAX
+        * high-definition 7.1 audio processor".
+        * Fixes ALSA bug#1600
+         */
+       { .serial = 0x30411297,
+         .name = "Shuttle XPC SD11G5 [SD11G5]",
+         .gpio_type = 1,
+         .i2c_adc = 1 } ,
         { .serial = 0,
           .name   = "AudigyLS [Unknown]" }
 };
@@ -1551,7 +1561,7 @@ static void __devexit snd_ca0106_remove(struct pci_dev *pci)
 }
 
 // PCI IDs
-static struct pci_device_id snd_ca0106_ids[] = {
+static struct pci_device_id snd_ca0106_ids[] __devinitdata = {
        { 0x1102, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* Audigy LS or Live 24bit */
        { 0, }
 };