1 files changed, 3 insertions, 8 deletions

diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index 9b003ff744ba..4a170890b3b1 100644
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -46,7 +46,7 @@ static void __init kafa_init_early(void)
         at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
 
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000);
+        at91_initialize(18432000);
 
         /* Set up the LEDs */
         at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
@@ -61,11 +61,6 @@ static void __init kafa_init_early(void)
         at91_set_serial_console(0);
 }
 
-static void __init kafa_init_irq(void)
-{
-        at91rm9200_init_interrupts(NULL);
-}
-
 static struct at91_eth_data __initdata kafa_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 0,
@@ -99,8 +94,8 @@ static void __init kafa_board_init(void)
 MACHINE_START(KAFA, "Sperry-Sun KAFA")
         /* Maintainer: Sergei Sharonov */
         .timer          = &at91rm9200_timer,
-        .map_io         = at91rm9200_map_io,
+        .map_io         = at91_map_io,
         .init_early     = kafa_init_early,
-        .init_irq       = kafa_init_irq,
+        .init_irq       = at91_init_irq_default,
         .init_machine   = kafa_board_init,
 MACHINE_END