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://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
cats-hw.c
diff --git
a/arch/arm/mach-footbridge/cats-hw.c
b/arch/arm/mach-footbridge/cats-hw.c
index
1b996b2
..
5b1a8db
100644
(file)
--- a/
arch/arm/mach-footbridge/cats-hw.c
+++ b/
arch/arm/mach-footbridge/cats-hw.c
@@
-86,8
+86,6
@@
fixup_cats(struct machine_desc *desc, struct tag *tags,
MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
- .phys_io = DC21285_ARMCSR_BASE,
- .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.soft_reboot = 1,
.fixup = fixup_cats,
.boot_params = 0x00000100,
.soft_reboot = 1,
.fixup = fixup_cats,