diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ixp23xx/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/dma.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ixp23xx/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/hardware.h (renamed from include/asm-arm/arch-ixp23xx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/io.h (renamed from include/asm-arm/arch-ixp23xx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/irqs.h (renamed from include/asm-arm/arch-ixp23xx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/ixdp2351.h (renamed from include/asm-arm/arch-ixp23xx/ixdp2351.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/ixp23xx.h (renamed from include/asm-arm/arch-ixp23xx/ixp23xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/memory.h (renamed from include/asm-arm/arch-ixp23xx/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/platform.h (renamed from include/asm-arm/arch-ixp23xx/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/system.h (renamed from include/asm-arm/arch-ixp23xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/time.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/timex.h (renamed from include/asm-arm/arch-ixp23xx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-ixp23xx/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ixp23xx/vmalloc.h) | 2 |
15 files changed, 23 insertions, 17 deletions
diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S index 2b25e640247d..905db3188724 100644 --- a/include/asm-arm/arch-ixp23xx/debug-macro.S +++ b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/debug-macro.S + * arch/arm/mach-ixp23xx/include/mach/debug-macro.S * * Debugging macro include header * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/ixp23xx.h> +#include <mach/ixp23xx.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/arch/arm/mach-ixp23xx/include/mach/dma.h b/arch/arm/mach-ixp23xx/include/mach/dma.h new file mode 100644 index 000000000000..8886544b93f7 --- /dev/null +++ b/arch/arm/mach-ixp23xx/include/mach/dma.h @@ -0,0 +1,3 @@ +/* + * arch/arm/mach-ixp23xx/include/mach/dma.h + */ diff --git a/include/asm-arm/arch-ixp23xx/entry-macro.S b/arch/arm/mach-ixp23xx/include/mach/entry-macro.S index ec9dd6fc2d0f..3f5338a7bbdd 100644 --- a/include/asm-arm/arch-ixp23xx/entry-macro.S +++ b/arch/arm/mach-ixp23xx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/entry-macro.S + * arch/arm/mach-ixp23xx/include/mach/entry-macro.S */ .macro disable_fiq diff --git a/include/asm-arm/arch-ixp23xx/hardware.h b/arch/arm/mach-ixp23xx/include/mach/hardware.h index c0010d21a684..c3192009a886 100644 --- a/include/asm-arm/arch-ixp23xx/hardware.h +++ b/arch/arm/mach-ixp23xx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/hardware.h + * arch/arm/mach-ixp23xx/include/mach/hardware.h * * Copyright (C) 2002-2004 Intel Corporation. * Copyricht (C) 2005 MontaVista Software, Inc. diff --git a/include/asm-arm/arch-ixp23xx/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h index 66f5bafc315c..305ea1808c71 100644 --- a/include/asm-arm/arch-ixp23xx/io.h +++ b/arch/arm/mach-ixp23xx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/io.h + * arch/arm/mach-ixp23xx/include/mach/io.h * * Original Author: Naeem M Afzal <naeem.m.afzal@intel.com> * Maintainer: Deepak Saxena <dsaxena@plexity.net> diff --git a/include/asm-arm/arch-ixp23xx/irqs.h b/arch/arm/mach-ixp23xx/include/mach/irqs.h index 27c580898958..3af33a04b8a2 100644 --- a/include/asm-arm/arch-ixp23xx/irqs.h +++ b/arch/arm/mach-ixp23xx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/irqs.h + * arch/arm/mach-ixp23xx/include/mach/irqs.h * * IRQ definitions for IXP23XX based systems * diff --git a/include/asm-arm/arch-ixp23xx/ixdp2351.h b/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h index d5e8a43d7bbd..663951027de5 100644 --- a/include/asm-arm/arch-ixp23xx/ixdp2351.h +++ b/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/ixdp2351.h + * arch/arm/mach-ixp23xx/include/mach/ixdp2351.h * * Register and other defines for IXDP2351 * diff --git a/include/asm-arm/arch-ixp23xx/ixp23xx.h b/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h index 3927b1d61b17..6d02481b1d6d 100644 --- a/include/asm-arm/arch-ixp23xx/ixp23xx.h +++ b/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/ixp23xx.h + * arch/arm/mach-ixp23xx/include/mach/ixp23xx.h * * Register definitions for IXP23XX * diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/arch/arm/mach-ixp23xx/include/mach/memory.h index c3d906af9fea..9d40115f7ebe 100644 --- a/include/asm-arm/arch-ixp23xx/memory.h +++ b/arch/arm/mach-ixp23xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/memory.h + * arch/arm/mach-ixp23xx/include/mach/memory.h * * Copyright (c) 2003-2004 Intel Corp. * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/arch/arm/mach-ixp23xx/include/mach/platform.h index db8aa304c93d..db9d9416e5e4 100644 --- a/include/asm-arm/arch-ixp23xx/platform.h +++ b/arch/arm/mach-ixp23xx/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/platform.h + * arch/arm/mach-ixp23xx/include/mach/platform.h * * Various bits of code used by platform-level code. * diff --git a/include/asm-arm/arch-ixp23xx/system.h b/arch/arm/mach-ixp23xx/include/mach/system.h index 54e8a51475e6..d57c3fc10f1f 100644 --- a/include/asm-arm/arch-ixp23xx/system.h +++ b/arch/arm/mach-ixp23xx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/system.h + * arch/arm/mach-ixp23xx/include/mach/system.h * * Copyright (C) 2003 Intel Corporation. * @@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> static inline void arch_idle(void) diff --git a/arch/arm/mach-ixp23xx/include/mach/time.h b/arch/arm/mach-ixp23xx/include/mach/time.h new file mode 100644 index 000000000000..b61dafc884ac --- /dev/null +++ b/arch/arm/mach-ixp23xx/include/mach/time.h @@ -0,0 +1,3 @@ +/* + * arch/arm/mach-ixp23xx/include/mach/time.h + */ diff --git a/include/asm-arm/arch-ixp23xx/timex.h b/arch/arm/mach-ixp23xx/include/mach/timex.h index 516f72fe6082..e341e9cf9c37 100644 --- a/include/asm-arm/arch-ixp23xx/timex.h +++ b/arch/arm/mach-ixp23xx/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/timex.h + * arch/arm/mach-ixp23xx/include/mach/timex.h * * XScale architecture timex specifications */ diff --git a/include/asm-arm/arch-ixp23xx/uncompress.h b/arch/arm/mach-ixp23xx/include/mach/uncompress.h index 16c1110f2304..8b4c358d2c04 100644 --- a/include/asm-arm/arch-ixp23xx/uncompress.h +++ b/arch/arm/mach-ixp23xx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/uncompress.h + * arch/arm/mach-ixp23xx/include/mach/uncompress.h * * Copyright (C) 2002-2004 Intel Corporation. * @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/arch/ixp23xx.h> +#include <mach/ixp23xx.h> #include <linux/serial_reg.h> #define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS) diff --git a/include/asm-arm/arch-ixp23xx/vmalloc.h b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h index 9f2566658541..dd519f678d10 100644 --- a/include/asm-arm/arch-ixp23xx/vmalloc.h +++ b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/vmalloc.h + * arch/arm/mach-ixp23xx/include/mach/vmalloc.h * * Copyright (c) 2005 MontaVista Software, Inc. * |