Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland...

[karo-tx-linux.git] / arch / arm / mach-imx / mm-imx21.c

diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c
index 68aa5d2ecdb1da8fd2a5955cd07952e1a73b8f49..12faeeaa0a9706ce4ea2eb0c774abff437dc9901 100644 (file)
--- a/arch/arm/mach-imx/mm-imx21.c
+++ b/arch/arm/mach-imx/mm-imx21.c
@@ -81,6 +81,6 @@ int imx21_register_gpios(void);
 
 void __init mx21_init_irq(void)
 {
-       imx21_register_gpios();
        mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR));
+       imx21_register_gpios();
 }