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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-csb337.c
diff --git
a/arch/arm/mach-at91/board-csb337.c
b/arch/arm/mach-at91/board-csb337.c
index
d98bcec
..
17654d5
100644
(file)
--- a/
arch/arm/mach-at91/board-csb337.c
+++ b/
arch/arm/mach-at91/board-csb337.c
@@
-46,7
+46,7
@@
static void __init csb337_init_early(void)
{
/* Initialize processor: 3.6864 MHz crystal */
static void __init csb337_init_early(void)
{
/* Initialize processor: 3.6864 MHz crystal */
- at91
rm9200
_initialize(3686400);
+ at91_initialize(3686400);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@
-58,11
+58,6
@@
static void __init csb337_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init csb337_init_irq(void)
-{
- at91rm9200_init_interrupts(NULL);
-}
-
static struct at91_eth_data __initdata csb337_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 0,
static struct at91_eth_data __initdata csb337_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 0,
@@
-258,8
+253,8
@@
static void __init csb337_board_init(void)
MACHINE_START(CSB337, "Cogent CSB337")
/* Maintainer: Bill Gatliff */
.timer = &at91rm9200_timer,
MACHINE_START(CSB337, "Cogent CSB337")
/* Maintainer: Bill Gatliff */
.timer = &at91rm9200_timer,
- .map_io = at91
rm9200
_map_io,
+ .map_io = at91_map_io,
.init_early = csb337_init_early,
.init_early = csb337_init_early,
- .init_irq =
csb337_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = csb337_board_init,
MACHINE_END
.init_machine = csb337_board_init,
MACHINE_END