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 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
ts409-setup.c
diff --git
a/arch/arm/mach-orion5x/ts409-setup.c
b/arch/arm/mach-orion5x/ts409-setup.c
index
0572dd1
..
0fbcc14
100644
(file)
--- a/
arch/arm/mach-orion5x/ts409-setup.c
+++ b/
arch/arm/mach-orion5x/ts409-setup.c
@@
-311,7
+311,7
@@
static void __init qnap_ts409_init(void)
MACHINE_START(TS409, "QNAP TS-409")
/* Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = qnap_ts409_init,
.map_io = orion5x_map_io,
.init_early = orion5x_init_early,