aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 18:02:47 -0500
committerOlof Johansson <olof@lixom.net>2012-03-07 18:02:47 -0500
commit269f6a93f6851b68848e67816a14a2ebf8a48c6b (patch)
tree34ea976a0d72c52c4b4b5d577a6d97c6c3712ea9 /arch/arm/mach-omap2/pm.c
parent412fe6b3a1f6fa6c88c11c8d2b2422b79342de8c (diff)
parent3223d007a3f9ddbd68424adf628e740dd87c564f (diff)
Merge branch 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
* 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3+: PM: VP: fix integer truncation error ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices() ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected ARM: OMAP1: Fix section mismatch for omap1_init_early() ARM: OMAP1: Fix typo in lcd_dma.c ARM: OMAP: mailbox: trivial whitespace fix ARM: OMAP: Remove definition cpu_is_omap4430() ARM: OMAP2+: included some headers twice ARM: OMAP: clock.c: included linux/debugfs.h twice ARM: OMAP: don't build hwspinlock in vain ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided ARM: omap: pandora: fix usbhs platform data ARM: OMAP: sram: Add am33xx SRAM support (minimal) ARM: OMAP2+: id: Add am33xx SoC type detection ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_ecc ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r--arch/arm/mach-omap2/pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index fb9b85bfc308..03f038c9b879 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -49,7 +49,7 @@ static int __init _init_omap_device(char *name)
49/* 49/*
50 * Build omap_devices for processors and bus. 50 * Build omap_devices for processors and bus.
51 */ 51 */
52static void omap2_init_processor_devices(void) 52static void __init omap2_init_processor_devices(void)
53{ 53{
54 _init_omap_device("mpu"); 54 _init_omap_device("mpu");
55 if (omap3_has_iva()) 55 if (omap3_has_iva())