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 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-snapper9260.c
diff --git
a/arch/arm/mach-at91/board-snapper9260.c
b/arch/arm/mach-at91/board-snapper9260.c
index
3eb0a11
..
c73d25e
100644
(file)
--- a/
arch/arm/mach-at91/board-snapper9260.c
+++ b/
arch/arm/mach-at91/board-snapper9260.c
@@
-4,7
+4,7
@@
* Copyright (C) 2010 Bluewater System Ltd
*
* Author: Andre Renaud <andre@bluewatersys.com>
* Copyright (C) 2010 Bluewater System Ltd
*
* Author: Andre Renaud <andre@bluewatersys.com>
- * Author: Ryan Mallon
<ryan@bluewatersys.com>
+ * Author: Ryan Mallon
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-42,7
+42,7
@@
static void __init snapper9260_init_early(void)
{
static void __init snapper9260_init_early(void)
{
- at91
sam9260
_initialize(18432000);
+ at91_initialize(18432000);
/* Debug on ttyS0 */
at91_register_uart(0, 0, 0);
/* Debug on ttyS0 */
at91_register_uart(0, 0, 0);
@@
-55,11
+55,6
@@
static void __init snapper9260_init_early(void)
at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
}
at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
}
-static void __init snapper9260_init_irq(void)
-{
- at91sam9260_init_interrupts(NULL);
-}
-
static struct at91_usbh_data __initdata snapper9260_usbh_data = {
.ports = 2,
};
static struct at91_usbh_data __initdata snapper9260_usbh_data = {
.ports = 2,
};
@@
-179,9
+174,9
@@
static void __init snapper9260_board_init(void)
MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
.timer = &at91sam926x_timer,
MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
.timer = &at91sam926x_timer,
- .map_io = at91
sam9260
_map_io,
+ .map_io = at91_map_io,
.init_early = snapper9260_init_early,
.init_early = snapper9260_init_early,
- .init_irq =
snapper9260_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = snapper9260_board_init,
MACHINE_END
.init_machine = snapper9260_board_init,
MACHINE_END