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 'depends/rmk/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
badge4.c
diff --git
a/arch/arm/mach-sa1100/badge4.c
b/arch/arm/mach-sa1100/badge4.c
index
b4311b0
..
bda83e1
100644
(file)
--- a/
arch/arm/mach-sa1100/badge4.c
+++ b/
arch/arm/mach-sa1100/badge4.c
@@
-302,7
+302,7
@@
static void __init badge4_map_io(void)
}
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
- .
boot_params = 0xc0000
100,
+ .
atag_offset = 0x
100,
.map_io = badge4_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,