git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into core/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-sam9261ek.c
diff --git
a/arch/arm/mach-at91/board-sam9261ek.c
b/arch/arm/mach-at91/board-sam9261ek.c
index
b60c22b
..
5096a0e
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9261ek.c
+++ b/
arch/arm/mach-at91/board-sam9261ek.c
@@
-57,7
+57,7
@@
static void __init ek_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
static void __init ek_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
- at91
sam9261
_initialize(18432000);
+ at91_initialize(18432000);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
@@
-69,12
+69,6
@@
static void __init ek_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init ek_init_irq(void)
-{
- at91sam9261_init_interrupts(NULL);
-}
-
-
/*
* DM9000 ethernet device
*/
/*
* DM9000 ethernet device
*/
@@
-621,8
+615,8
@@
MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
#endif
/* Maintainer: Atmel */
.timer = &at91sam926x_timer,
#endif
/* Maintainer: Atmel */
.timer = &at91sam926x_timer,
- .map_io = at91
sam9261
_map_io,
+ .map_io = at91_map_io,
.init_early = ek_init_early,
.init_early = ek_init_early,
- .init_irq =
ek_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = ek_board_init,
MACHINE_END
.init_machine = ek_board_init,
MACHINE_END