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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-sam9m10g45ek.c
diff --git
a/arch/arm/mach-at91/board-sam9m10g45ek.c
b/arch/arm/mach-at91/board-sam9m10g45ek.c
index
33eaa13
..
ad234cc
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/
arch/arm/mach-at91/board-sam9m10g45ek.c
@@
-50,7
+50,7
@@
static void __init ek_init_early(void)
{
/* Initialize processor: 12.000 MHz crystal */
static void __init ek_init_early(void)
{
/* Initialize processor: 12.000 MHz crystal */
- at91
sam9g45
_initialize(12000000);
+ at91_initialize(12000000);
/* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@
-63,12
+63,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)
-{
- at91sam9g45_init_interrupts(NULL);
-}
-
-
/*
* USB HS Host port (common to OHCI & EHCI)
*/
/*
* USB HS Host port (common to OHCI & EHCI)
*/
@@
-422,8
+416,8
@@
static void __init ek_board_init(void)
MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
/* Maintainer: Atmel */
.timer = &at91sam926x_timer,
MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
/* Maintainer: Atmel */
.timer = &at91sam926x_timer,
- .map_io = at91
sam9g45
_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