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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear3xx
/
spear300_evb.c
diff --git
a/arch/arm/mach-spear3xx/spear300_evb.c
b/arch/arm/mach-spear3xx/spear300_evb.c
index
69006f6
..
a5ff98e
100644
(file)
--- a/
arch/arm/mach-spear3xx/spear300_evb.c
+++ b/
arch/arm/mach-spear3xx/spear300_evb.c
@@
-64,7
+64,7
@@
static void __init spear300_evb_init(void)
}
MACHINE_START(SPEAR300, "ST-SPEAR300-EVB")
}
MACHINE_START(SPEAR300, "ST-SPEAR300-EVB")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.map_io = spear3xx_map_io,
.init_irq = spear3xx_init_irq,
.timer = &spear3xx_timer,
.map_io = spear3xx_map_io,
.init_irq = spear3xx_init_irq,
.timer = &spear3xx_timer,