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/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
shannon.c
diff --git
a/arch/arm/mach-sa1100/shannon.c
b/arch/arm/mach-sa1100/shannon.c
index
7917b24
..
1cccbf5
100644
(file)
--- a/
arch/arm/mach-sa1100/shannon.c
+++ b/
arch/arm/mach-sa1100/shannon.c
@@
-82,7
+82,7
@@
static void __init shannon_map_io(void)
}
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
}
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
- .
boot_params = 0xc0000
100,
+ .
atag_offset = 0x
100,
.map_io = shannon_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.map_io = shannon_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,