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 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
lsmini-setup.c
diff --git
a/arch/arm/mach-orion5x/lsmini-setup.c
b/arch/arm/mach-orion5x/lsmini-setup.c
index
c704f05
..
ab9b0cf
100644
(file)
--- a/
arch/arm/mach-orion5x/lsmini-setup.c
+++ b/
arch/arm/mach-orion5x/lsmini-setup.c
@@
-267,8
+267,6
@@
static void __init lsmini_init(void)
#ifdef CONFIG_MACH_LINKSTATION_MINI
MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")
/* Maintainer: Alexey Kopytko <alexey@kopytko.ru> */
#ifdef CONFIG_MACH_LINKSTATION_MINI
MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")
/* Maintainer: Alexey Kopytko <alexey@kopytko.ru> */
- .phys_io = ORION5X_REGS_PHYS_BASE,
- .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC,
.boot_params = 0x00000100,
.init_machine = lsmini_init,
.map_io = orion5x_map_io,
.boot_params = 0x00000100,
.init_machine = lsmini_init,
.map_io = orion5x_map_io,