Skip to content

L
linux
Commit 564768ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

into home.osdl.org:/home/torvalds/v2.5/linux
parents 6108b874 3967e9a5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
arch/arm/mm/proc-xscale.S
View file @ 564768ae
...@@ -670,7 +670,7 @@ __80200_proc_info: ...@@ -670,7 +670,7 @@ __80200_proc_info:
.type __80321_proc_info,#object .type __80321_proc_info,#object
__80321_proc_info: __80321_proc_info:
.long 0x69052420 .long 0x69052420
.long 0xfffffff0 .long 0xfffff7e0
.long 0x00000c0e .long 0x00000c0e
b __xscale_setup b __xscale_setup
.long cpu_arch_name .long cpu_arch_name
......
include/asm-arm/arch-shark/hardware.h
View file @ 564768ae
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#define PCIBIOS_MIN_IO 0x6000 #define PCIBIOS_MIN_IO 0x6000
#define PCIBIOS_MIN_MEM 0x50000000 #define PCIBIOS_MIN_MEM 0x50000000
#define PCIMEM_BASE 0xe8000000
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7