diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 09:36:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 09:36:50 -0700 |
| commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
| tree | 734289dc85074903d9e636a935d43414746e222c /sound/soc | |
| parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8974.c | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index b47c252ef90..a2d01d10a5d 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -125,7 +125,7 @@ SOC_ENUM("Equaliser EQ4 Bandwidth", wm8974_enum[9]), SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), -SOC_ENUM("Equaliser EQ5 Bandwith", wm8974_enum[11]), +SOC_ENUM("Equaliser EQ5 Bandwidth", wm8974_enum[11]), SOC_ENUM("EQ5 Cut Off", wm8974_enum[12]), SOC_SINGLE_TLV("EQ5 Volume", WM8974_EQ5, 0, 24, 1, eq_tlv), diff --git a/sound/soc/ux500/Kconfig b/sound/soc/ux500/Kconfig index 069330d82be..6b799c0e88d 100644 --- a/sound/soc/ux500/Kconfig +++ b/sound/soc/ux500/Kconfig @@ -20,8 +20,8 @@ config SND_SOC_UX500_PLAT_DMA help Say Y if you want to enable the Ux500 platform-driver. -+config SND_SOC_UX500_MACH_MOP500 -+ tristate "Machine - MOP500 (Ux500 + AB8500)" +config SND_SOC_UX500_MACH_MOP500 + tristate "Machine - MOP500 (Ux500 + AB8500)" depends on AB8500_CORE && AB8500_GPADC && SND_SOC_UX500 select SND_SOC_AB8500_CODEC select SND_SOC_UX500_PLAT_MSP_I2S |