diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-20 23:36:26 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-20 23:43:24 -0700 |
| commit | 7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b (patch) | |
| tree | a95ee8b0ff92daccc7480239f54962d150416559 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 9f8466c6e09e62a1d047f2e57d90cd42e46b35c1 (diff) | |
| parent | a6d25f4c951b8b28f2eaec6f891ff834622532f2 (diff) | |
| download | olio-linux-3.10-7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b.tar.xz olio-linux-3.10-7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b.zip | |
Merge tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren, fixes for omaps:
- a section mismatch fix for hwmod
- boot fix for omap2plus_defconfig for omap2
- musb interrupt fix when using device tree
- am33xx clock fix that I missed earlier somehow
- omap1 dma return code error fix
* tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock
ARM: OMAP2+: Add missing CONFIG_ARCH_MULTI_V6=y to omap2plus_defconfig
ARM: OMAP: fix error return code in omap1_system_dma_init()
ARM: OMAP: fix __init section mismatch for _enable_preprogram
ARM: dts: Fix musb interrupt for device tree booting
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index d25a95fe992..e3289888adf 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2065,7 +2065,7 @@ static int _omap4_get_context_lost(struct omap_hwmod *oh) * do so is present in the hwmod data, then call it and pass along the * return value; otherwise, return 0. */ -static int __init _enable_preprogram(struct omap_hwmod *oh) +static int _enable_preprogram(struct omap_hwmod *oh) { if (!oh->class->enable_preprogram) return 0; |