diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-clps7500/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/acornfb.h (renamed from include/asm-arm/arch-cl7500/acornfb.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/debug-macro.S (renamed from include/asm-arm/arch-cl7500/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/dma.h (renamed from include/asm-arm/arch-cl7500/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/entry-macro.S (renamed from include/asm-arm/arch-rpc/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/hardware.h (renamed from include/asm-arm/arch-cl7500/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/io.h (renamed from include/asm-arm/arch-cl7500/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/irq.h (renamed from include/asm-arm/arch-cl7500/irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/irqs.h (renamed from include/asm-arm/arch-cl7500/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/memory.h (renamed from include/asm-arm/arch-cl7500/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/system.h (renamed from include/asm-arm/arch-cl7500/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/timex.h (renamed from include/asm-arm/arch-cl7500/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/uncompress.h (renamed from include/asm-arm/arch-cl7500/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/vmalloc.h (renamed from include/asm-arm/arch-cl7500/vmalloc.h) | 2 |
14 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index cfd8aca9f7da..cc1b82179e83 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c @@ -21,7 +21,7 @@ #include <asm/mach/irq.h> #include <asm/mach/time.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iomd.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/include/asm-arm/arch-cl7500/acornfb.h b/arch/arm/mach-clps7500/include/mach/acornfb.h index aea6330c9745..aea6330c9745 100644 --- a/include/asm-arm/arch-cl7500/acornfb.h +++ b/arch/arm/mach-clps7500/include/mach/acornfb.h diff --git a/include/asm-arm/arch-cl7500/debug-macro.S b/arch/arm/mach-clps7500/include/mach/debug-macro.S index 9a2b67d24098..af4104e7e84a 100644 --- a/include/asm-arm/arch-cl7500/debug-macro.S +++ b/arch/arm/mach-clps7500/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-cl7500/debug-macro.S +/* arch/arm/mach-clps7500/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-cl7500/dma.h b/arch/arm/mach-clps7500/include/mach/dma.h index 591ed2551892..63fcde505498 100644 --- a/include/asm-arm/arch-cl7500/dma.h +++ b/arch/arm/mach-clps7500/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/dma.h + * arch/arm/mach-clps7500/include/mach/dma.h * * Copyright (C) 1999 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-rpc/entry-macro.S b/arch/arm/mach-clps7500/include/mach/entry-macro.S index 5bd55557ccca..4e7e54144093 100644 --- a/include/asm-arm/arch-rpc/entry-macro.S +++ b/arch/arm/mach-clps7500/include/mach/entry-macro.S @@ -1,4 +1,4 @@ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/entry-macro-iomd.S> .equ ioc_base_high, IOC_BASE & 0xff000000 diff --git a/include/asm-arm/arch-cl7500/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h index 1adfd18e6154..d66578a3371c 100644 --- a/include/asm-arm/arch-cl7500/hardware.h +++ b/arch/arm/mach-clps7500/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/hardware.h + * arch/arm/mach-clps7500/include/mach/hardware.h * * Copyright (C) 1996-1999 Russell King. * Copyright (C) 1999 Nexus Electronics Ltd. @@ -10,7 +10,7 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include <asm/arch/memory.h> +#include <mach/memory.h> #include <asm/hardware/iomd.h> #ifdef __ASSEMBLY__ diff --git a/include/asm-arm/arch-cl7500/io.h b/arch/arm/mach-clps7500/include/mach/io.h index 80f9b19cac9e..2ff2860889ed 100644 --- a/include/asm-arm/arch-cl7500/io.h +++ b/arch/arm/mach-clps7500/include/mach/io.h @@ -1,6 +1,6 @@ /* - * linux/include/asm-arm/arch-cl7500/io.h - * from linux/include/asm-arm/arch-rpc/io.h + * arch/arm/mach-clps7500/include/mach/io.h + * from arch/arm/mach-rpc/include/mach/io.h * * Copyright (C) 1997 Russell King * @@ -10,7 +10,7 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-cl7500/irq.h b/arch/arm/mach-clps7500/include/mach/irq.h index 4b286331f3f8..e8da3c58df76 100644 --- a/include/asm-arm/arch-cl7500/irq.h +++ b/arch/arm/mach-clps7500/include/mach/irq.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-cl7500/irq.h + * arch/arm/mach-clps7500/include/mach/irq.h * * Copyright (C) 1996 Russell King * Copyright (C) 1999, 2001 Nexus Electronics Ltd. diff --git a/include/asm-arm/arch-cl7500/irqs.h b/arch/arm/mach-clps7500/include/mach/irqs.h index f20996eadf19..bee66b487f59 100644 --- a/include/asm-arm/arch-cl7500/irqs.h +++ b/arch/arm/mach-clps7500/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/irqs.h + * arch/arm/mach-clps7500/include/mach/irqs.h * * Copyright (C) 1999 Nexus Electronics Ltd */ diff --git a/include/asm-arm/arch-cl7500/memory.h b/arch/arm/mach-clps7500/include/mach/memory.h index 3178140e24ca..3326aa99d3ec 100644 --- a/include/asm-arm/arch-cl7500/memory.h +++ b/arch/arm/mach-clps7500/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/memory.h + * arch/arm/mach-clps7500/include/mach/memory.h * * Copyright (c) 1996,1997,1998 Russell King. * diff --git a/include/asm-arm/arch-cl7500/system.h b/arch/arm/mach-clps7500/include/mach/system.h index a9505d6a74d7..624fc2830ae0 100644 --- a/include/asm-arm/arch-cl7500/system.h +++ b/arch/arm/mach-clps7500/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/system.h + * arch/arm/mach-clps7500/include/mach/system.h * * Copyright (c) 1999 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-cl7500/timex.h b/arch/arm/mach-clps7500/include/mach/timex.h index 8a4175fc0106..dfaa9b425757 100644 --- a/include/asm-arm/arch-cl7500/timex.h +++ b/arch/arm/mach-clps7500/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/timex.h + * arch/arm/mach-clps7500/include/mach/timex.h * * CL7500 architecture timex specifications * diff --git a/include/asm-arm/arch-cl7500/uncompress.h b/arch/arm/mach-clps7500/include/mach/uncompress.h index c437e0c88c3f..d7d0af4b49fc 100644 --- a/include/asm-arm/arch-cl7500/uncompress.h +++ b/arch/arm/mach-clps7500/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/uncompress.h + * arch/arm/mach-clps7500/include/mach/uncompress.h * * Copyright (C) 1999, 2000 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-cl7500/vmalloc.h b/arch/arm/mach-clps7500/include/mach/vmalloc.h index ba8d7a84456a..8fc5406d1b6d 100644 --- a/include/asm-arm/arch-cl7500/vmalloc.h +++ b/arch/arm/mach-clps7500/include/mach/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-cl7500/vmalloc.h + * arch/arm/mach-clps7500/include/mach/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x1c000000) |