Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

1 files changed, 11 insertions, 1 deletions

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6ed7c0bfa091..9477838a9c88 100644
--- 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]" }
 };