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 'sh-latest' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
fsg-setup.c
diff --git
a/arch/arm/mach-ixp4xx/fsg-setup.c
b/arch/arm/mach-ixp4xx/fsg-setup.c
index
72333a0
..
2887c35
100644
(file)
--- a/
arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/
arch/arm/mach-ixp4xx/fsg-setup.c
@@
-272,7
+272,7
@@
MACHINE_START(FSG, "Freecom FSG-3")
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer,
- .
boot_params = 0x0
100,
+ .
atag_offset = 0x
100,
.init_machine = fsg_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
.init_machine = fsg_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,