diff options
Diffstat (limited to 'arch/arm/mach-at91/board-cam60.c')
-rw-r--r-- | arch/arm/mach-at91/board-cam60.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index 148fccb9a25a..d1abd5898e85 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c | |||
@@ -48,7 +48,7 @@ | |||
48 | static void __init cam60_init_early(void) | 48 | static void __init cam60_init_early(void) |
49 | { | 49 | { |
50 | /* Initialize processor: 10 MHz crystal */ | 50 | /* Initialize processor: 10 MHz crystal */ |
51 | at91sam9260_initialize(10000000); | 51 | at91_initialize(10000000); |
52 | 52 | ||
53 | /* DBGU on ttyS0. (Rx & Tx only) */ | 53 | /* DBGU on ttyS0. (Rx & Tx only) */ |
54 | at91_register_uart(0, 0, 0); | 54 | at91_register_uart(0, 0, 0); |
@@ -57,12 +57,6 @@ static void __init cam60_init_early(void) | |||
57 | at91_set_serial_console(0); | 57 | at91_set_serial_console(0); |
58 | } | 58 | } |
59 | 59 | ||
60 | static void __init cam60_init_irq(void) | ||
61 | { | ||
62 | at91sam9260_init_interrupts(NULL); | ||
63 | } | ||
64 | |||
65 | |||
66 | /* | 60 | /* |
67 | * USB Host | 61 | * USB Host |
68 | */ | 62 | */ |
@@ -199,8 +193,8 @@ static void __init cam60_board_init(void) | |||
199 | MACHINE_START(CAM60, "KwikByte CAM60") | 193 | MACHINE_START(CAM60, "KwikByte CAM60") |
200 | /* Maintainer: KwikByte */ | 194 | /* Maintainer: KwikByte */ |
201 | .timer = &at91sam926x_timer, | 195 | .timer = &at91sam926x_timer, |
202 | .map_io = at91sam9260_map_io, | 196 | .map_io = at91_map_io, |
203 | .init_early = cam60_init_early, | 197 | .init_early = cam60_init_early, |
204 | .init_irq = cam60_init_irq, | 198 | .init_irq = at91_init_irq_default, |
205 | .init_machine = cam60_board_init, | 199 | .init_machine = cam60_board_init, |
206 | MACHINE_END | 200 | MACHINE_END |