diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 04:43:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 04:43:21 +0100 |
commit | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (patch) | |
tree | b9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df /arch/arm/mach-clps711x/autcpu12.c | |
parent | [PATCH] When CONFIG_CC_OPTIMIZE_FOR_SIZE, allow gcc4 to control inlining (diff) | |
parent | [ARM] 3262/4: allow ptraced syscalls to be overriden (diff) | |
download | linux-8d5c315059460e665c804d5a9b641f7f0a1e9dd7.tar.xz linux-8d5c315059460e665c804d5a9b641f7f0a1e9dd7.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-clps711x/autcpu12.c')
-rw-r--r-- | arch/arm/mach-clps711x/autcpu12.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index 43b9423d1440..c13ca6c56baa 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c @@ -64,7 +64,6 @@ void __init autcpu12_map_io(void) MACHINE_START(AUTCPU12, "autronix autcpu12") /* Maintainer: Thomas Gleixner */ - .phys_ram = 0xc0000000, .phys_io = 0x80000000, .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, .boot_params = 0xc0020000, |