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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-flexibity.c
diff --git
a/arch/arm/mach-at91/board-flexibity.c
b/arch/arm/mach-at91/board-flexibity.c
index
466c063
..
4c3f65d
100644
(file)
--- a/
arch/arm/mach-at91/board-flexibity.c
+++ b/
arch/arm/mach-at91/board-flexibity.c
@@
-40,7
+40,7
@@
static void __init flexibity_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
static void __init flexibity_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
- at91
sam9260
_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);
@@
-49,11
+49,6
@@
static void __init flexibity_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init flexibity_init_irq(void)
-{
- at91sam9260_init_interrupts(NULL);
-}
-
/* USB Host port */
static struct at91_usbh_data __initdata flexibity_usbh_data = {
.ports = 2,
/* USB Host port */
static struct at91_usbh_data __initdata flexibity_usbh_data = {
.ports = 2,
@@
-155,8
+150,8
@@
static void __init flexibity_board_init(void)
MACHINE_START(FLEXIBITY, "Flexibity Connect")
/* Maintainer: Maxim Osipov */
.timer = &at91sam926x_timer,
MACHINE_START(FLEXIBITY, "Flexibity Connect")
/* Maintainer: Maxim Osipov */
.timer = &at91sam926x_timer,
- .map_io = at91
sam9260
_map_io,
+ .map_io = at91_map_io,
.init_early = flexibity_init_early,
.init_early = flexibity_init_early,
- .init_irq =
flexibity_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = flexibity_board_init,
MACHINE_END
.init_machine = flexibity_board_init,
MACHINE_END