diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 15:43:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 15:43:21 +0200 |
| commit | 0e896b1ddc1905df904df98c204bacf028219729 (patch) | |
| tree | dc1965765c0a55e1260c4c3956db4ae2b23cc235 /arch/arm/mach-clps711x/include/mach/hardware.h | |
| parent | 48b9bf0953867d4fb21f44d8c1a061b5358fe53b (diff) | |
| parent | 0573a2bb885848af67127b77dbebb900d0ae19b9 (diff) | |
Merge branch 'clps711x/cleanup' into next/cleanupcleanup
* clps711x/cleanup:
ARM: clps711x: Cleanup IRQ handling
ARM clps711x: Removed unused header mach/time.h
ARM: clps711x: Added note about support EP731x CPU to Kconfig
ARM: clps711x: Added missing register definitions
ARM: clps711x: Used own subarch directory for store header file
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h index d31fc791f516..13a64fcd7dd1 100644 --- a/arch/arm/mach-clps711x/include/mach/hardware.h +++ b/arch/arm/mach-clps711x/include/mach/hardware.h @@ -22,7 +22,7 @@ #ifndef __MACH_HARDWARE_H #define __MACH_HARDWARE_H -#include <asm/hardware/clps7111.h> +#include <mach/clps711x.h> #define CLPS711X_VIRT_BASE IOMEM(0xff000000) |