diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 15:06:21 -0400 |
| commit | 3d58f48ba05caed9118bce62b3047f8683438835 (patch) | |
| tree | 94c911034f0e14ded73d3e9e6e9f8e22b6cad822 /sound/pci/ca0106/ca0106_mixer.c | |
| parent | abfe0af9813153bae8c85d9bac966bafcb8ddab1 (diff) | |
| parent | d9244b5d2fbfe9fa540024b410047af13ceec90f (diff) | |
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
| -rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index ad2888705d2a..c111efe61c3c 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
| @@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) | |||
| 800 | "Capture Volume", | 800 | "Capture Volume", |
| 801 | "External Amplifier", | 801 | "External Amplifier", |
| 802 | "Sigmatel 4-Speaker Stereo Playback Switch", | 802 | "Sigmatel 4-Speaker Stereo Playback Switch", |
| 803 | "Sigmatel Surround Phase Inversion Playback ", | 803 | "Surround Phase Inversion Playback Switch", |
| 804 | NULL | 804 | NULL |
| 805 | }; | 805 | }; |
| 806 | static char *ca0106_rename_ctls[] = { | 806 | static char *ca0106_rename_ctls[] = { |