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 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
nas100d-setup.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-setup.c
b/arch/arm/mach-ixp4xx/nas100d-setup.c
index
b752fa4
..
de716fa
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-setup.c
@@
-313,7
+313,7
@@
static void __init nas100d_init(void)
MACHINE_START(NAS100D, "Iomega NAS 100d")
/* Maintainer: www.nslu2-linux.org */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer,
git.openpandora.org / pandora-kernel.git / blobdiff