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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-picotux200.c
diff --git
a/arch/arm/mach-at91/board-picotux200.c
b/arch/arm/mach-at91/board-picotux200.c
index
756cc2a
..
b7b8390
100644
(file)
--- a/
arch/arm/mach-at91/board-picotux200.c
+++ b/
arch/arm/mach-at91/board-picotux200.c
@@
-46,7
+46,7
@@
static void __init picotux200_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
static void __init picotux200_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
- at91
rm9200
_initialize(18432000);
+ at91_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@
-60,11
+60,6
@@
static void __init picotux200_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init picotux200_init_irq(void)
-{
- at91rm9200_init_interrupts(NULL);
-}
-
static struct at91_eth_data __initdata picotux200_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
static struct at91_eth_data __initdata picotux200_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
@@
-124,8
+119,8
@@
static void __init picotux200_board_init(void)
MACHINE_START(PICOTUX2XX, "picotux 200")
/* Maintainer: Kleinhenz Elektronik GmbH */
.timer = &at91rm9200_timer,
MACHINE_START(PICOTUX2XX, "picotux 200")
/* Maintainer: Kleinhenz Elektronik GmbH */
.timer = &at91rm9200_timer,
- .map_io = at91
rm9200
_map_io,
+ .map_io = at91_map_io,
.init_early = picotux200_init_early,
.init_early = picotux200_init_early,
- .init_irq =
picotux200_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = picotux200_board_init,
MACHINE_END
.init_machine = picotux200_board_init,
MACHINE_END