diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:00:00 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:00:00 +0000 |
commit | 33e1e10a5874e735dd2897116ddc222e581e54bf (patch) | |
tree | 79e8e000de59818c27fb97fc920448b06009a2c8 /arch/arm/mach-imx/mach-imx6q.c | |
parent | c2735391fbc68feae10d6d14e60956c8106e725f (diff) | |
parent | f475058f48d3acb3c3979311c9532f3113839468 (diff) | |
download | linux-33e1e10a5874e735dd2897116ddc222e581e54bf.tar.bz2 |
Merge branch 'imx6q/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 8bf5fa349484..9cd860a27af5 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -34,6 +34,7 @@ static void __init imx6q_map_io(void) { imx_lluart_map_io(); imx_scu_map_io(); + imx6q_clock_map_io(); } static void __init imx6q_gpio_add_irq_domain(struct device_node *np, |