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 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
ts219-setup.c
diff --git
a/arch/arm/mach-kirkwood/ts219-setup.c
b/arch/arm/mach-kirkwood/ts219-setup.c
index
68f32f2
..
262c034
100644
(file)
--- a/
arch/arm/mach-kirkwood/ts219-setup.c
+++ b/
arch/arm/mach-kirkwood/ts219-setup.c
@@
-132,7
+132,7
@@
subsys_initcall(ts219_pci_init);
MACHINE_START(TS219, "QNAP TS-119/TS-219")
/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = qnap_ts219_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,