| 1 | From b1bd6bd7c230e00b40b0b859f3c23eb56ef39f0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Imre Kaloz <kaloz@openwrt.org> |
| 3 | Date: Fri, 2 Sep 2011 08:07:00 +0200 |
| 4 | Subject: [PATCH] ARM: remove missing cns3xxx includes |
| 5 | |
| 6 | Commit c9d95fbe59e426eed7f16e7cac812e46ac4772d0 deleted cns3xxx' hardware.h, |
| 7 | but didn't remove references for it, breaking the build. |
| 8 | |
| 9 | Signed-off-by: Imre Kaloz <kaloz@openwrt.org> |
| 10 | --- |
| 11 | arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 1 - |
| 12 | arch/arm/mach-cns3xxx/include/mach/system.h | 1 - |
| 13 | arch/arm/mach-cns3xxx/include/mach/uncompress.h | 1 - |
| 14 | 3 files changed, 0 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | --- a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S |
| 17 | +++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S |
| 18 | @@ -8,7 +8,6 @@ |
| 19 | * published by the Free Software Foundation. |
| 20 | */ |
| 21 | |
| 22 | -#include <mach/hardware.h> |
| 23 | #include <asm/hardware/entry-macro-gic.S> |
| 24 | |
| 25 | .macro disable_fiq |
| 26 | --- a/arch/arm/mach-cns3xxx/include/mach/system.h |
| 27 | +++ b/arch/arm/mach-cns3xxx/include/mach/system.h |
| 28 | @@ -13,7 +13,6 @@ |
| 29 | |
| 30 | #include <linux/io.h> |
| 31 | #include <asm/proc-fns.h> |
| 32 | -#include <mach/hardware.h> |
| 33 | |
| 34 | static inline void arch_idle(void) |
| 35 | { |
| 36 | --- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h |
| 37 | +++ b/arch/arm/mach-cns3xxx/include/mach/uncompress.h |
| 38 | @@ -8,7 +8,6 @@ |
| 39 | */ |
| 40 | |
| 41 | #include <asm/mach-types.h> |
| 42 | -#include <mach/hardware.h> |
| 43 | #include <mach/cns3xxx.h> |
| 44 | |
| 45 | #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) |
| 46 | |