projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-ixp4xx
/
dsmg600-setup.c
diff --git
a/arch/arm/mach-ixp4xx/dsmg600-setup.c
b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 96e378345801ba88a5f052b3bb54df6836dac420..8837fbca27ce7e06a47f50c5d05537986d7c3bb8 100644
(file)
--- a/
arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/
arch/arm/mach-ixp4xx/dsmg600-setup.c
@@
-278,7
+278,7
@@
static void __init dsmg600_init(void)
MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")
/* Maintainer: www.nslu2-linux.org */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &dsmg600_timer,