diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /sound/pci/intel8x0.c | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 171ada535209..754867ed4785 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -1954,6 +1954,18 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { | |||
| 1954 | .name = "Sony S1XP", | 1954 | .name = "Sony S1XP", |
| 1955 | .type = AC97_TUNE_INV_EAPD | 1955 | .type = AC97_TUNE_INV_EAPD |
| 1956 | }, | 1956 | }, |
| 1957 | { | ||
| 1958 | .subvendor = 0x104d, | ||
| 1959 | .subdevice = 0x81c0, | ||
| 1960 | .name = "Sony VAIO VGN-T350P", /*AD1981B*/ | ||
| 1961 | .type = AC97_TUNE_INV_EAPD | ||
| 1962 | }, | ||
| 1963 | { | ||
| 1964 | .subvendor = 0x104d, | ||
| 1965 | .subdevice = 0x81c5, | ||
| 1966 | .name = "Sony VAIO VGN-B1VP", /*AD1981B*/ | ||
| 1967 | .type = AC97_TUNE_INV_EAPD | ||
| 1968 | }, | ||
| 1957 | { | 1969 | { |
| 1958 | .subvendor = 0x1043, | 1970 | .subvendor = 0x1043, |
| 1959 | .subdevice = 0x80f3, | 1971 | .subdevice = 0x80f3, |
