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 'btrfs-3.0' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-eco920.c
diff --git
a/arch/arm/mach-at91/board-eco920.c
b/arch/arm/mach-at91/board-eco920.c
index
bfc0062
..
8252c72
100644
(file)
--- a/
arch/arm/mach-at91/board-eco920.c
+++ b/
arch/arm/mach-at91/board-eco920.c
@@
-35,7
+35,7
@@
static void __init eco920_init_early(void)
/* Set cpu type: PQFP */
at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
/* Set cpu type: PQFP */
at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
- at91
rm9200
_initialize(18432000);
+ at91_initialize(18432000);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@
-47,11
+47,6
@@
static void __init eco920_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init eco920_init_irq(void)
-{
- at91rm9200_init_interrupts(NULL);
-}
-
static struct at91_eth_data __initdata eco920_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 1,
static struct at91_eth_data __initdata eco920_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 1,
@@
-135,8
+130,8
@@
static void __init eco920_board_init(void)
MACHINE_START(ECO920, "eco920")
/* Maintainer: Sascha Hauer */
.timer = &at91rm9200_timer,
MACHINE_START(ECO920, "eco920")
/* Maintainer: Sascha Hauer */
.timer = &at91rm9200_timer,
- .map_io = at91
rm9200
_map_io,
+ .map_io = at91_map_io,
.init_early = eco920_init_early,
.init_early = eco920_init_early,
- .init_irq =
eco920_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = eco920_board_init,
MACHINE_END
.init_machine = eco920_board_init,
MACHINE_END