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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-sam9-l9260.c
diff --git
a/arch/arm/mach-at91/board-sam9-l9260.c
b/arch/arm/mach-at91/board-sam9-l9260.c
index
25a26be
..
aaf1bf0
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9-l9260.c
+++ b/
arch/arm/mach-at91/board-sam9-l9260.c
@@
-44,7
+44,7
@@
#include "generic.h"
#include "generic.h"
-static void __init ek_
map_io
(void)
+static void __init ek_
init_early
(void)
{
/* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000);
{
/* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000);
@@
-212,9
+212,9
@@
static void __init ek_board_init(void)
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
/* Maintainer: Olimex */
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
/* Maintainer: Olimex */
- .boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
.timer = &at91sam926x_timer,
- .map_io = ek_map_io,
+ .map_io = at91sam9260_map_io,
+ .init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_machine = ek_board_init,
MACHINE_END
.init_irq = ek_init_irq,
.init_machine = ek_board_init,
MACHINE_END