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-usb-a9260.c
diff --git
a/arch/arm/mach-at91/board-usb-a9260.c
b/arch/arm/mach-at91/board-usb-a9260.c
index
0e784e6
..
8c4c1a0
100644
(file)
--- a/
arch/arm/mach-at91/board-usb-a9260.c
+++ b/
arch/arm/mach-at91/board-usb-a9260.c
@@
-51,7
+51,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
sam9260
_initialize(12000000);
+ at91_initialize(12000000);
/* 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,12
+60,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)
-{
- at91sam9260_init_interrupts(NULL);
-}
-
-
/*
* USB Host port
*/
/*
* USB Host port
*/
@@
-229,8
+223,8
@@
static void __init ek_board_init(void)
MACHINE_START(USB_A9260, "CALAO USB_A9260")
/* Maintainer: calao-systems */
.timer = &at91sam926x_timer,
MACHINE_START(USB_A9260, "CALAO USB_A9260")
/* Maintainer: calao-systems */
.timer = &at91sam926x_timer,
- .map_io = at91
sam9260
_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