1 files changed, 6 insertions, 9 deletions

diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c
index 23ea9d63b986..54c32d00b610 100644
--- a/arch/arm/mach-at91rm9200/board-dk.c
+++ b/arch/arm/mach-at91rm9200/board-dk.c
@@ -42,14 +42,6 @@
 
 #include "generic.h"
 
-static void __init dk_init_irq(void)
-{
-        /* Initialize AIC controller */
-        at91rm9200_init_irq(NULL);
-
-        /* Set up the GPIO interrupts */
-        at91_gpio_irq_setup(BGA_GPIO_BANKS);
-}
 
 /*
  * Serial port configuration.
@@ -65,7 +57,7 @@ static struct at91_uart_config __initdata dk_uart_config = {
 static void __init dk_map_io(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000);
+        at91rm9200_initialize(18432000, AT91RM9200_BGA);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
@@ -74,6 +66,11 @@ static void __init dk_map_io(void)
         at91_init_serial(&dk_uart_config);
 }
 
+static void __init dk_init_irq(void)
+{
+        at91rm9200_init_interrupts(NULL);
+}
+
 static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,