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-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
ls-chl-setup.c
diff --git
a/arch/arm/mach-orion5x/ls-chl-setup.c
b/arch/arm/mach-orion5x/ls-chl-setup.c
index
20a9b66
..
6ae12aa
100644
(file)
--- a/
arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/
arch/arm/mach-orion5x/ls-chl-setup.c
@@
-321,6
+321,7
@@
MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)")
.boot_params = 0x00000100,
.init_machine = lschl_init,
.map_io = orion5x_map_io,
+ .init_early = orion5x_init_early,
.init_irq = orion5x_init_irq,
.timer = &orion5x_timer,
.fixup = tag_fixup_mem32,