diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:54:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:54:52 -0800 |
| commit | 7113578a8a930259d6497976208e5b3e57141c5c (patch) | |
| tree | 4f67bc4b9ae1428c029799e5b5fcf562d1085fe3 /sound/pci/ac97/ac97_id.h | |
| parent | 597d8c717856f6094837850f3eb4850820b36451 (diff) | |
| parent | f59bb4b64eca0fa906f51f25a05054f11de94f92 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix ALC861-VD capture source mixer
ALSA: ac97: add AC97 STMicroelectronics' codecs
ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist
ASoC: Fix WM8350 DSP mode B configuration
sbawe: fix memory detection part 2
sound: oss: off by one bug
ALSA: usb-audio - Avoid Oops after disconnect
ALSA: test off by one in setsamplerate()
ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2
Diffstat (limited to 'sound/pci/ac97/ac97_id.h')
| -rw-r--r-- | sound/pci/ac97/ac97_id.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_id.h b/sound/pci/ac97/ac97_id.h index c129492c82b3..d603147c4a96 100644 --- a/sound/pci/ac97/ac97_id.h +++ b/sound/pci/ac97/ac97_id.h @@ -62,3 +62,5 @@ #define AC97_ID_CM9761_78 0x434d4978 #define AC97_ID_CM9761_82 0x434d4982 #define AC97_ID_CM9761_83 0x434d4983 +#define AC97_ID_ST7597 0x53544d02 +#define AC97_ID_ST_AC97_ID4 0x53544d04 |