Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
564768ae · Linus Torvalds · 6108b874 · 3967e9a5 · 564768ae · 564768ae
Commit 564768ae authored Oct 21, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arch/arm/mm/proc-xscale.S arch/arm/mm/proc-xscale.S +1 -1

include/asm-arm/arch-shark/hardware.h include/asm-arm/arch-shark/hardware.h +1 -0

No files found.
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -670,7 +670,7 @@ __80200_proc_info:
 	.type	__80321_proc_info,#object
 __80321_proc_info:
 	.long	0x69052420
-	.long	0xfffffff0
+	.long	0xfffff7e0
 	.long	0x00000c0e
 	b	__xscale_setup
 	.long	cpu_arch_name

--- a/include/asm-arm/arch-shark/hardware.h
+++ b/include/asm-arm/arch-shark/hardware.h
@@ -51,6 +51,7 @@

 #define PCIBIOS_MIN_IO          0x6000
 #define PCIBIOS_MIN_MEM         0x50000000
+#define PCIMEM_BASE		0xe8000000

 #endif