diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
| commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
| tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /sound/ppc/tumbler.c | |
| parent | 7584af10cf46e0f4aa1696f1be79fa0f19a945ba (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
Merge branch 'topic/beep-rename' into topic/core-change
Diffstat (limited to 'sound/ppc/tumbler.c')
| -rw-r--r-- | sound/ppc/tumbler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 08e584d1453a..789f44f4ac78 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
| @@ -905,7 +905,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { | |||
| 905 | }; | 905 | }; |
| 906 | static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { | 906 | static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { |
| 907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 908 | .name = "PC Speaker Playback Switch", | 908 | .name = "Speaker Playback Switch", |
| 909 | .info = snd_pmac_boolean_mono_info, | 909 | .info = snd_pmac_boolean_mono_info, |
| 910 | .get = tumbler_get_mute_switch, | 910 | .get = tumbler_get_mute_switch, |
| 911 | .put = tumbler_put_mute_switch, | 911 | .put = tumbler_put_mute_switch, |