---

yaml
---
r: 201681
b: refs/heads/master
c: 84659ab
h: refs/heads/master
i:
  201679: 9379210
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95afd090752a1f7dab6f4b24b1b0d12593e643bb
+refs/heads/master: 84659ab5851aae05035a41b378c4c9aca2d2aeb4

trunk/arch/arm/mach-imx/mm-imx1.c

@@ -45,6 +45,6 @@ int imx1_register_gpios(void);
 
 void __init mx1_init_irq(void)
 {
-	imx1_register_gpios();
 	mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));
+	imx1_register_gpios();
 }

trunk/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();
 }

trunk/arch/arm/mach-imx/mm-imx27.c

@@ -81,6 +81,6 @@ int imx27_register_gpios(void);
 
 void __init mx27_init_irq(void)
 {
-	imx27_register_gpios();
 	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
+	imx27_register_gpios();
 }

trunk/arch/arm/mach-mx25/mm.c

@@ -69,7 +69,7 @@ int imx25_register_gpios(void);
 
 void __init mx25_init_irq(void)
 {
-	imx25_register_gpios();
 	mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT);
+	imx25_register_gpios();
 }
 

trunk/arch/arm/mach-mx3/mm.c

@@ -97,8 +97,8 @@ int imx3x_register_gpios(void);
 
 void __init mx31_init_irq(void)
 {
-	imx3x_register_gpios();
 	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
+	imx3x_register_gpios();
 }
 
 void __init mx35_init_irq(void)

trunk/arch/arm/mach-mx5/mm.c

@@ -81,6 +81,6 @@ void __init mx51_init_irq(void)
 	if (!tzic_virt)
 		panic("unable to map TZIC interrupt controller\n");
 
-	imx51_register_gpios();
 	tzic_init_irq(tzic_virt);
+	imx51_register_gpios();
 }