diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
commit | 34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch) | |
tree | fee2be2e3453e246ee55ffb711a36a8ec053361a /arch/arm/mach-omap2/pdata-quirks.c | |
parent | ALSA: control: Fix breakage of user ctl element addition (diff) | |
parent | ALSA: hda - Treat stereo-to-mono mix properly (diff) | |
download | linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.tar.xz linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/arm/mach-omap2/pdata-quirks.c')
-rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 190fa43e7479..e642b079e9f3 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -173,6 +173,7 @@ static void __init omap3_igep0030_rev_g_legacy_init(void) static void __init omap3_evm_legacy_init(void) { + hsmmc2_internal_input_clk(); legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 149); } |