diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:51 +0200 |
| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 (patch) | |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 /arch/arm/mach-shark/include/mach/hardware.h | |
| parent | 3de46fda4c104deef17ec70f85361f5c6b84ce0e (diff) | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-shark/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 01bf76099ce..94d84b27a0c 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h @@ -10,35 +10,8 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#ifndef __ASSEMBLY__ - -/* - * Mapping areas - */ -#define IO_BASE 0xe0000000 - -#else - -#define IO_BASE 0 - -#endif - -#define IO_SIZE 0x08000000 -#define IO_START 0x40000000 -#define ROMCARD_SIZE 0x08000000 -#define ROMCARD_START 0x10000000 - - -/* defines for the Framebuffer */ -#define FB_START 0x06000000 -#define FB_SIZE 0x01000000 - #define UNCACHEABLE_ADDR 0xdf010000 -#define SEQUOIA_LED_GREEN (1<<6) -#define SEQUOIA_LED_AMBER (1<<5) -#define SEQUOIA_LED_BACK (1<<7) - #define pcibios_assign_all_busses() 1 #define PCIBIOS_MIN_IO 0x6000 |