summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-23 15:41:24 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-23 15:41:24 +0100
commit7ccf6124fa3d71872626e352bded0802cc13e7c2 (patch)
tree912a93cdb538f2446cc1204ffba7c7cc21b372c0 /arch/arm
parent2bbf6078dc948e87564c1a947f23ea4cf2349a13 (diff)
parenteda21d37eb1e7d065d0427679d0947da805ad35d (diff)
downloadop-kernel-dev-7ccf6124fa3d71872626e352bded0802cc13e7c2.zip
op-kernel-dev-7ccf6124fa3d71872626e352bded0802cc13e7c2.tar.gz
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/twl-common.c2
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 0606f23..5d142fa 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)
}
#else /* SOC_OMAP_TWL4030 */
-void __init omap_twl4030_audio_init(char *card_name, int codec_sysclk)
+void __init omap_twl4030_audio_init(char *card_name)
{
return;
}
OpenPOWER on IntegriCloud