]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards
authorVedran Miletic <rivanvx@gmail.com>
Mon, 29 Sep 2008 13:08:00 +0000 (15:08 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 10 Oct 2008 11:41:44 +0000 (13:41 +0200)
This patch adds PCI IDs for:
* TerraTec DMX XFire 1024
* Hercules Gamesurround Fortissimo II
* Hercules Gamesurround Fortissimo III 7.1
All those cards were supported as generic CS46xx device,
so they will work as before. I'm pretty sure that first two
cards work, as they have same hardware design as reference
card. Not sure about Fortissimo III, but this won't break it
if it worked.

Tested on TerraTec DMX XFire 1024.

Signed-off-by: Vedran Miletic <rivanvx@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
sound/pci/cs46xx/cs46xx_lib.c

index a10ab8283f9a003049b98d36572d3ef630b5949f..fb6dc398025753c08fd861ed134677dd675d1117 100644 (file)
@@ -3501,8 +3501,9 @@ static struct cs_card_type __devinitdata cards[] = {
                .name = "Mitac MI6020/21",
                .amp = amp_voyetra,
        },
+       /* Hercules Game Theatre XP */
        {
-               .vendor = 0x14AF,
+               .vendor = 0x14af, /* Guillemot Corporation */
                .id = 0x0050,
                .name = "Hercules Game Theatre XP",
                .amp = amp_hercules,
@@ -3544,7 +3545,23 @@ static struct cs_card_type __devinitdata cards[] = {
                .amp = amp_hercules,
                .mixer_init = hercules_mixer_init,
        },
+       /* Herculess Fortissimo */
+       {
+               .vendor = 0x1681,
+               .id = 0xa010,
+               .name = "Hercules Gamesurround Fortissimo II",
+       },
+       {
+               .vendor = 0x1681,
+               .id = 0xa011,
+               .name = "Hercules Gamesurround Fortissimo III 7.1",
+       },
        /* Teratec */
+       {
+               .vendor = 0x153b,
+               .id = 0x112e,
+               .name = "Terratec DMX XFire 1024",
+       },
        {
                .vendor = 0x153b,
                .id = 0x1136,