aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-10-24 16:34:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 00:42:50 -0400
commit6c50444723f2e6487b3377450f90d813a88e6c31 (patch)
tree29d121c037bf3bc837e80e6140797dafbf470704 /sound
parent7059abedd2f04b68bd7e1a79c9c72f7aeee134c0 (diff)
[PATCH] Merge headphone and speaker volume controls for Panasonic R4 laptop
Signed-off-by: Keith Packard <keithp@neko.keithp.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/intel8x0.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 7f22dab07240..9c1bce7afa86 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1962,6 +1962,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
1962 .type = AC97_TUNE_HP_ONLY 1962 .type = AC97_TUNE_HP_ONLY
1963 }, 1963 },
1964 { 1964 {
1965 .subvendor = 0x10f7,
1966 .subdevice = 0x834c,
1967 .name = "Panasonic CF-R4",
1968 .type = AC97_TUNE_HP_ONLY,
1969 },
1970 {
1965 .subvendor = 0x110a, 1971 .subvendor = 0x110a,
1966 .subdevice = 0x0056, 1972 .subdevice = 0x0056,
1967 .name = "Fujitsu-Siemens Scenic", /* AD1981? */ 1973 .name = "Fujitsu-Siemens Scenic", /* AD1981? */