aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 12:50:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 12:50:13 -0400
commit76d21c563569bcea6bc67d65cc2c460cff643058 (patch)
tree4dd2c9846ea7838077099646418978e354df1680 /sound
parent6e50e9f9f4a8277b4d76de417ca77cf3921bd524 (diff)
parent472af2b05bdefcaee7e754e22cbf131110017ad6 (diff)
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/Kconfig2
-rw-r--r--sound/soc/codecs/wl1273.c11
2 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index d63c1754e05f..6943e24a74a1 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -51,7 +51,7 @@ config SND_SOC_ALL_CODECS
51 select SND_SOC_TWL6040 if TWL4030_CORE 51 select SND_SOC_TWL6040 if TWL4030_CORE
52 select SND_SOC_UDA134X 52 select SND_SOC_UDA134X
53 select SND_SOC_UDA1380 if I2C 53 select SND_SOC_UDA1380 if I2C
54 select SND_SOC_WL1273 if RADIO_WL1273 54 select SND_SOC_WL1273 if MFD_WL1273_CORE
55 select SND_SOC_WM2000 if I2C 55 select SND_SOC_WM2000 if I2C
56 select SND_SOC_WM8350 if MFD_WM8350 56 select SND_SOC_WM8350 if MFD_WM8350
57 select SND_SOC_WM8400 if MFD_WM8400 57 select SND_SOC_WM8400 if MFD_WM8400
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 1ad0d5aecece..c8a874d0d4ca 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Author: Matti Aaltonen, <matti.j.aaltonen@nokia.com> 4 * Author: Matti Aaltonen, <matti.j.aaltonen@nokia.com>
5 * 5 *
6 * Copyright: (C) 2010 Nokia Corporation 6 * Copyright: (C) 2010, 2011 Nokia Corporation
7 * 7 *
8 * This program is free software; you can redistribute it and/or 8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License 9 * modify it under the terms of the GNU General Public License
@@ -179,7 +179,12 @@ static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol,
179 return 0; 179 return 0;
180} 180}
181 181
182static const char *wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" }; 182/*
183 * TODO: Implement the audio routing in the driver. Now this control
184 * only indicates the setting that has been done elsewhere (in the user
185 * space).
186 */
187static const char * const wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" };
183 188
184static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol, 189static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
185 struct snd_ctl_elem_value *ucontrol) 190 struct snd_ctl_elem_value *ucontrol)
@@ -239,7 +244,7 @@ static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol,
239 return 1; 244 return 1;
240} 245}
241 246
242static const char *wl1273_audio_strings[] = { "Digital", "Analog" }; 247static const char * const wl1273_audio_strings[] = { "Digital", "Analog" };
243 248
244static const struct soc_enum wl1273_audio_enum = 249static const struct soc_enum wl1273_audio_enum =
245 SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(wl1273_audio_strings), 250 SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(wl1273_audio_strings),