diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /sound/soc/samsung/neo1973_wm8753.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'sound/soc/samsung/neo1973_wm8753.c')
| -rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index 78bfdb3f5d7e..452230975632 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
| @@ -228,7 +228,7 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = { | |||
| 228 | SOC_DAPM_PIN_SWITCH("Handset Mic"), | 228 | SOC_DAPM_PIN_SWITCH("Handset Mic"), |
| 229 | }; | 229 | }; |
| 230 | 230 | ||
| 231 | /* GTA02 specific routes and controlls */ | 231 | /* GTA02 specific routes and controls */ |
| 232 | 232 | ||
| 233 | #ifdef CONFIG_MACH_NEO1973_GTA02 | 233 | #ifdef CONFIG_MACH_NEO1973_GTA02 |
| 234 | 234 | ||
| @@ -372,7 +372,7 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) | |||
| 372 | return 0; | 372 | return 0; |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | /* GTA01 specific controlls */ | 375 | /* GTA01 specific controls */ |
| 376 | 376 | ||
| 377 | #ifdef CONFIG_MACH_NEO1973_GTA01 | 377 | #ifdef CONFIG_MACH_NEO1973_GTA01 |
| 378 | 378 | ||