diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 12:00:49 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 12:00:49 +0400 |
| commit | e59a7943f2f72a1dc218447f4f285c8b67b3a98e (patch) | |
| tree | 278b164568087fd6c92bb31572238ecf9ab4674f /arch/arm/mach-imx/mach-scb9328.c | |
| parent | fad107086d5a869c1c07e5bb35b7b57a10ecf578 (diff) | |
| parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff) | |
| download | linux-e59a7943f2f72a1dc218447f4f285c8b67b3a98e.tar.xz | |
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
Conflicts:
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-scb9328.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-scb9328.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-scb9328.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c index b77386573502..db2d60470e15 100644 --- a/arch/arm/mach-imx/mach-scb9328.c +++ b/arch/arm/mach-imx/mach-scb9328.c @@ -115,6 +115,8 @@ static struct platform_device *devices[] __initdata = { */ static void __init scb9328_init(void) { + imx1_soc_init(); + mxc_gpio_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "UART1"); |