aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-migor
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-15 00:00:02 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-08-15 00:00:02 -0400
commit4b6b987969b076298485697bfb0d0e35502642a3 (patch)
treea8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/sh/boards/mach-migor
parentdf47cd096c8f54a5242e3a2ffb4525c804567eda (diff)
parent60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (diff)
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/sh/boards/mach-migor')
-rw-r--r--arch/sh/boards/mach-migor/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index a508a0fa7315..be8f0d94f6f1 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -617,7 +617,7 @@ static int __init migor_devices_setup(void)
617 617
618 return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); 618 return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));
619} 619}
620__initcall(migor_devices_setup); 620arch_initcall(migor_devices_setup);
621 621
622/* Return the board specific boot mode pin configuration */ 622/* Return the board specific boot mode pin configuration */
623static int migor_mode_pins(void) 623static int migor_mode_pins(void)