diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /include/asm-arm/arch-aaec2000/hardware.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'include/asm-arm/arch-aaec2000/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-aaec2000/hardware.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-aaec2000/hardware.h b/include/asm-arm/arch-aaec2000/hardware.h index 4c37219e030e..153506fd06ed 100644 --- a/include/asm-arm/arch-aaec2000/hardware.h +++ b/include/asm-arm/arch-aaec2000/hardware.h | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | #ifndef __ASM_ARCH_HARDWARE_H | 11 | #ifndef __ASM_ARCH_HARDWARE_H |
| 12 | #define __ASM_ARCH_HARDWARE_H | 12 | #define __ASM_ARCH_HARDWARE_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | 14 | #include <asm/sizes.h> |
| 15 | #include <asm/arch/aaec2000.h> | ||
| 15 | 16 | ||
| 16 | /* The kernel is loaded at physical address 0xf8000000. | 17 | /* The kernel is loaded at physical address 0xf8000000. |
| 17 | * We map the IO space a bit after | 18 | * We map the IO space a bit after |