diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-23 10:41:24 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-23 10:41:24 -0400 |
| commit | 7ccf6124fa3d71872626e352bded0802cc13e7c2 (patch) | |
| tree | 912a93cdb538f2446cc1204ffba7c7cc21b372c0 /arch | |
| parent | 2bbf6078dc948e87564c1a947f23ea4cf2349a13 (diff) | |
| parent | eda21d37eb1e7d065d0427679d0947da805ad35d (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 0606f238a247..5d142facb0e6 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
| @@ -559,7 +559,7 @@ void __init omap_twl4030_audio_init(char *card_name) | |||
| 559 | } | 559 | } |
| 560 | 560 | ||
| 561 | #else /* SOC_OMAP_TWL4030 */ | 561 | #else /* SOC_OMAP_TWL4030 */ |
| 562 | void __init omap_twl4030_audio_init(char *card_name, int codec_sysclk) | 562 | void __init omap_twl4030_audio_init(char *card_name) |
| 563 | { | 563 | { |
| 564 | return; | 564 | return; |
| 565 | } | 565 | } |