diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-integrator/include/mach/bits.h (renamed from include/asm-arm/arch-integrator/bits.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/cm.h (renamed from include/asm-arm/arch-integrator/cm.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/debug-macro.S (renamed from include/asm-arm/arch-integrator/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/dma.h (renamed from include/asm-arm/arch-integrator/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/entry-macro.S (renamed from include/asm-arm/arch-integrator/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/hardware.h (renamed from include/asm-arm/arch-integrator/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/impd1.h (renamed from include/asm-arm/arch-integrator/impd1.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/io.h (renamed from include/asm-arm/arch-integrator/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/irqs.h (renamed from include/asm-arm/arch-integrator/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/lm.h (renamed from include/asm-arm/arch-integrator/lm.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/memory.h (renamed from include/asm-arm/arch-integrator/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/platform.h (renamed from include/asm-arm/arch-integrator/platform.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/system.h (renamed from include/asm-arm/arch-integrator/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/timex.h (renamed from include/asm-arm/arch-integrator/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/uncompress.h (renamed from include/asm-arm/arch-integrator/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/vmalloc.h (renamed from include/asm-arm/arch-integrator/vmalloc.h) | 2 |
16 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-arm/arch-integrator/bits.h b/arch/arm/mach-integrator/include/mach/bits.h index 09b024e0496a..09b024e0496a 100644 --- a/include/asm-arm/arch-integrator/bits.h +++ b/arch/arm/mach-integrator/include/mach/bits.h diff --git a/include/asm-arm/arch-integrator/cm.h b/arch/arm/mach-integrator/include/mach/cm.h index 1ab353e23595..1ab353e23595 100644 --- a/include/asm-arm/arch-integrator/cm.h +++ b/arch/arm/mach-integrator/include/mach/cm.h diff --git a/include/asm-arm/arch-integrator/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S index 85b327c352df..d347d659ea30 100644 --- a/include/asm-arm/arch-integrator/debug-macro.S +++ b/arch/arm/mach-integrator/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-integrator/debug-macro.S +/* arch/arm/mach-integrator/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-integrator/dma.h b/arch/arm/mach-integrator/include/mach/dma.h index 83fd6bbaf9d3..fbebe85a2db7 100644 --- a/include/asm-arm/arch-integrator/dma.h +++ b/arch/arm/mach-integrator/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/dma.h + * arch/arm/mach-integrator/include/mach/dma.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-integrator/entry-macro.S b/arch/arm/mach-integrator/include/mach/entry-macro.S index ef535a68bdd3..7649c57acb53 100644 --- a/include/asm-arm/arch-integrator/entry-macro.S +++ b/arch/arm/mach-integrator/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-integrator/entry-macro.S + * arch/arm/mach-integrator/include/mach/entry-macro.S * * Low-level IRQ helper macros for Integrator platforms * @@ -7,8 +7,8 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <asm/arch/hardware.h> -#include <asm/arch/irqs.h> +#include <mach/hardware.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-integrator/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h index 6f0947bc500d..1251319ef9ae 100644 --- a/include/asm-arm/arch-integrator/hardware.h +++ b/arch/arm/mach-integrator/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/hardware.h + * arch/arm/mach-integrator/include/mach/hardware.h * * This file contains the hardware definitions of the Integrator. * @@ -23,7 +23,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * Where in virtual memory the IO devices (timers, system controllers diff --git a/include/asm-arm/arch-integrator/impd1.h b/arch/arm/mach-integrator/include/mach/impd1.h index d75de4b14237..d75de4b14237 100644 --- a/include/asm-arm/arch-integrator/impd1.h +++ b/arch/arm/mach-integrator/include/mach/impd1.h diff --git a/include/asm-arm/arch-integrator/io.h b/arch/arm/mach-integrator/include/mach/io.h index c8f2175948bd..f21bb5493dd9 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/arch/arm/mach-integrator/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/io.h + * arch/arm/mach-integrator/include/mach/io.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/irqs.h b/arch/arm/mach-integrator/include/mach/irqs.h index ba7b3afee445..1fbe6d190222 100644 --- a/include/asm-arm/arch-integrator/irqs.h +++ b/arch/arm/mach-integrator/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/irqs.h + * arch/arm/mach-integrator/include/mach/irqs.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. diff --git a/include/asm-arm/arch-integrator/lm.h b/arch/arm/mach-integrator/include/mach/lm.h index 28186b6f2c09..28186b6f2c09 100644 --- a/include/asm-arm/arch-integrator/lm.h +++ b/arch/arm/mach-integrator/include/mach/lm.h diff --git a/include/asm-arm/arch-integrator/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index 1ab56d783e7c..be7e63c21d25 100644 --- a/include/asm-arm/arch-integrator/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/memory.h + * arch/arm/mach-integrator/include/mach/memory.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 83c4c1ceb411..83c4c1ceb411 100644 --- a/include/asm-arm/arch-integrator/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h diff --git a/include/asm-arm/arch-integrator/system.h b/arch/arm/mach-integrator/include/mach/system.h index 8ea442237d20..c485345c8c77 100644 --- a/include/asm-arm/arch-integrator/system.h +++ b/arch/arm/mach-integrator/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/system.h + * arch/arm/mach-integrator/include/mach/system.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/cm.h> +#include <mach/cm.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-integrator/timex.h b/arch/arm/mach-integrator/include/mach/timex.h index 87a762818ba2..1dcb42028c82 100644 --- a/include/asm-arm/arch-integrator/timex.h +++ b/arch/arm/mach-integrator/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/timex.h + * arch/arm/mach-integrator/include/mach/timex.h * * Integrator architecture timex specifications * diff --git a/include/asm-arm/arch-integrator/uncompress.h b/arch/arm/mach-integrator/include/mach/uncompress.h index f61825c4d901..30452f00a164 100644 --- a/include/asm-arm/arch-integrator/uncompress.h +++ b/arch/arm/mach-integrator/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/uncompress.h + * arch/arm/mach-integrator/include/mach/uncompress.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/vmalloc.h b/arch/arm/mach-integrator/include/mach/vmalloc.h index 170cccece523..e87ab0b37bdd 100644 --- a/include/asm-arm/arch-integrator/vmalloc.h +++ b/arch/arm/mach-integrator/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/vmalloc.h + * arch/arm/mach-integrator/include/mach/vmalloc.h * * Copyright (C) 2000 Russell King. * |