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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
dockstar-setup.c
diff --git
a/arch/arm/mach-kirkwood/dockstar-setup.c
b/arch/arm/mach-kirkwood/dockstar-setup.c
index
a90475d
..
433ea36
100644
(file)
--- a/
arch/arm/mach-kirkwood/dockstar-setup.c
+++ b/
arch/arm/mach-kirkwood/dockstar-setup.c
@@
-102,8
+102,6
@@
static void __init dockstar_init(void)
}
MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")
- .phys_io = KIRKWOOD_REGS_PHYS_BASE,
- .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.init_machine = dockstar_init,
.map_io = kirkwood_map_io,