diff options
| author | Mark Brown | 2012-08-23 16:41:24 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-08-23 16:41:24 +0200 |
| commit | 7ccf6124fa3d71872626e352bded0802cc13e7c2 (patch) | |
| tree | 912a93cdb538f2446cc1204ffba7c7cc21b372c0 | |
| parent | Merge branch 'asoc-omap' into for-3.7 (diff) | |
| parent | ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is no... (diff) | |
| download | kernel-qcow2-linux-7ccf6124fa3d71872626e352bded0802cc13e7c2.tar.gz kernel-qcow2-linux-7ccf6124fa3d71872626e352bded0802cc13e7c2.tar.xz kernel-qcow2-linux-7ccf6124fa3d71872626e352bded0802cc13e7c2.zip | |
Merge branch 'asoc-omap' into for-3.7
| -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) } #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; } |