1 files changed, 5 insertions, 11 deletions

diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 1325a50101a..817f59d7251 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -64,7 +64,7 @@ static int inline ek_have_2mmc(void)
 static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91sam9260_initialize(18432000);
+        at91_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -81,12 +81,6 @@ static void __init ek_init_early(void)
         at91_set_serial_console(0);
 }
 
-static void __init ek_init_irq(void)
-{
-        at91sam9260_init_interrupts(NULL);
-}
-
-
 /*
  * USB Host port
  */
@@ -404,17 +398,17 @@ static void __init ek_board_init(void)
 MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
         /* Maintainer: Atmel */
         .timer          = &at91sam926x_timer,
-        .map_io         = at91sam9260_map_io,
+        .map_io         = at91_map_io,
         .init_early     = ek_init_early,
-        .init_irq       = ek_init_irq,
+        .init_irq       = at91_init_irq_default,
         .init_machine   = ek_board_init,
 MACHINE_END
 
 MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
         /* Maintainer: Atmel */
         .timer          = &at91sam926x_timer,
-        .map_io         = at91sam9260_map_io,
+        .map_io         = at91_map_io,
         .init_early     = ek_init_early,
-        .init_irq       = ek_init_irq,
+        .init_irq       = at91_init_irq_default,
         .init_machine   = ek_board_init,
 MACHINE_END