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 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-cam60.c
diff --git
a/arch/arm/mach-at91/board-cam60.c
b/arch/arm/mach-at91/board-cam60.c
index
148fccb
..
d1abd58
100644
(file)
--- a/
arch/arm/mach-at91/board-cam60.c
+++ b/
arch/arm/mach-at91/board-cam60.c
@@
-48,7
+48,7
@@
static void __init cam60_init_early(void)
{
/* Initialize processor: 10 MHz crystal */
static void __init cam60_init_early(void)
{
/* Initialize processor: 10 MHz crystal */
- at91
sam9260
_initialize(10000000);
+ at91_initialize(10000000);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@
-57,12
+57,6
@@
static void __init cam60_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init cam60_init_irq(void)
-{
- at91sam9260_init_interrupts(NULL);
-}
-
-
/*
* USB Host
*/
/*
* USB Host
*/
@@
-199,8
+193,8
@@
static void __init cam60_board_init(void)
MACHINE_START(CAM60, "KwikByte CAM60")
/* Maintainer: KwikByte */
.timer = &at91sam926x_timer,
MACHINE_START(CAM60, "KwikByte CAM60")
/* Maintainer: KwikByte */
.timer = &at91sam926x_timer,
- .map_io = at91
sam9260
_map_io,
+ .map_io = at91_map_io,
.init_early = cam60_init_early,
.init_early = cam60_init_early,
- .init_irq =
cam60_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = cam60_board_init,
MACHINE_END
.init_machine = cam60_board_init,
MACHINE_END