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-ixp23xx
/
espresso.c
diff --git
a/arch/arm/mach-ixp23xx/espresso.c
b/arch/arm/mach-ixp23xx/espresso.c
index
e25e5fe
..
30dd316
100644
(file)
--- a/
arch/arm/mach-ixp23xx/espresso.c
+++ b/
arch/arm/mach-ixp23xx/espresso.c
@@
-88,6
+88,6
@@
MACHINE_START(ESPRESSO, "IP Fabrics Double Espresso")
.map_io = ixp23xx_map_io,
.init_irq = ixp23xx_init_irq,
.timer = &ixp23xx_timer,
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = espresso_init,
MACHINE_END