diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/adma.h (renamed from include/asm-arm/arch-iop13xx/adma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop13xx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/dma.h (renamed from include/asm-arm/arch-iop13xx/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop13xx/entry-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/hardware.h (renamed from include/asm-arm/arch-iop13xx/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/io.h (renamed from include/asm-arm/arch-iop13xx/io.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/iop13xx.h (renamed from include/asm-arm/arch-iop13xx/iop13xx.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/iq81340.h (renamed from include/asm-arm/arch-iop13xx/iq81340.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/irqs.h (renamed from include/asm-arm/arch-iop13xx/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/memory.h (renamed from include/asm-arm/arch-iop13xx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/msi.h (renamed from include/asm-arm/arch-iop13xx/msi.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/pci.h (renamed from include/asm-arm/arch-iop13xx/pci.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/system.h (renamed from include/asm-arm/arch-iop13xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/time.h (renamed from include/asm-arm/arch-iop13xx/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/timex.h (renamed from include/asm-arm/arch-iop13xx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop13xx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-iop13xx/vmalloc.h) | 0 |
17 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-arm/arch-iop13xx/adma.h b/arch/arm/mach-iop13xx/include/mach/adma.h index 26f60af67168..60019c8e6465 100644 --- a/include/asm-arm/arch-iop13xx/adma.h +++ b/arch/arm/mach-iop13xx/include/mach/adma.h @@ -19,7 +19,7 @@ #define _ADMA_H #include <linux/types.h> #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iop_adma.h> #define ADMA_ACCR(chan) (chan->mmr_base + 0x0) diff --git a/include/asm-arm/arch-iop13xx/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S index 788b4e386c16..9037d2e8557c 100644 --- a/include/asm-arm/arch-iop13xx/debug-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop13xx/debug-macro.S + * arch/arm/mach-iop13xx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop13xx/dma.h b/arch/arm/mach-iop13xx/include/mach/dma.h index d79846fbb394..d79846fbb394 100644 --- a/include/asm-arm/arch-iop13xx/dma.h +++ b/arch/arm/mach-iop13xx/include/mach/dma.h diff --git a/include/asm-arm/arch-iop13xx/entry-macro.S b/arch/arm/mach-iop13xx/include/mach/entry-macro.S index a624a7870c64..a624a7870c64 100644 --- a/include/asm-arm/arch-iop13xx/entry-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/entry-macro.S diff --git a/include/asm-arm/arch-iop13xx/hardware.h b/arch/arm/mach-iop13xx/include/mach/hardware.h index 8e1d56289846..8e1d56289846 100644 --- a/include/asm-arm/arch-iop13xx/hardware.h +++ b/arch/arm/mach-iop13xx/include/mach/hardware.h diff --git a/include/asm-arm/arch-iop13xx/io.h b/arch/arm/mach-iop13xx/include/mach/io.h index a6e0f9e6ddcf..a6e0f9e6ddcf 100644 --- a/include/asm-arm/arch-iop13xx/io.h +++ b/arch/arm/mach-iop13xx/include/mach/io.h diff --git a/include/asm-arm/arch-iop13xx/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h index 52b7fab7ef60..52b7fab7ef60 100644 --- a/include/asm-arm/arch-iop13xx/iop13xx.h +++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h diff --git a/include/asm-arm/arch-iop13xx/iq81340.h b/arch/arm/mach-iop13xx/include/mach/iq81340.h index ba2cf931e9ce..ba2cf931e9ce 100644 --- a/include/asm-arm/arch-iop13xx/iq81340.h +++ b/arch/arm/mach-iop13xx/include/mach/iq81340.h diff --git a/include/asm-arm/arch-iop13xx/irqs.h b/arch/arm/mach-iop13xx/include/mach/irqs.h index 054e7acb5bfa..054e7acb5bfa 100644 --- a/include/asm-arm/arch-iop13xx/irqs.h +++ b/arch/arm/mach-iop13xx/include/mach/irqs.h diff --git a/include/asm-arm/arch-iop13xx/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index 031a0fa78eff..e8b59d8f1bb9 100644 --- a/include/asm-arm/arch-iop13xx/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h @@ -1,7 +1,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-iop13xx/msi.h b/arch/arm/mach-iop13xx/include/mach/msi.h index b80c5ae17e99..b80c5ae17e99 100644 --- a/include/asm-arm/arch-iop13xx/msi.h +++ b/arch/arm/mach-iop13xx/include/mach/msi.h diff --git a/include/asm-arm/arch-iop13xx/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h index 4041f30d4cd3..17b5515af8b1 100644 --- a/include/asm-arm/arch-iop13xx/pci.h +++ b/arch/arm/mach-iop13xx/include/mach/pci.h @@ -1,6 +1,6 @@ #ifndef _IOP13XX_PCI_H_ #define _IOP13XX_PCI_H_ -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include <asm/io.h> struct pci_sys_data; diff --git a/include/asm-arm/arch-iop13xx/system.h b/arch/arm/mach-iop13xx/include/mach/system.h index 8575af8db78c..c7127f416e1f 100644 --- a/include/asm-arm/arch-iop13xx/system.h +++ b/arch/arm/mach-iop13xx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-iop13xx/system.h + * arch/arm/mach-iop13xx/include/mach/system.h * * Copyright (C) 2004 Intel Corp. * @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/iop13xx.h> +#include <mach/iop13xx.h> static inline void arch_idle(void) { cpu_do_idle(); diff --git a/include/asm-arm/arch-iop13xx/time.h b/arch/arm/mach-iop13xx/include/mach/time.h index 49213d9d7cad..49213d9d7cad 100644 --- a/include/asm-arm/arch-iop13xx/time.h +++ b/arch/arm/mach-iop13xx/include/mach/time.h diff --git a/include/asm-arm/arch-iop13xx/timex.h b/arch/arm/mach-iop13xx/include/mach/timex.h index 47564ecb3872..5b1f1c8a8270 100644 --- a/include/asm-arm/arch-iop13xx/timex.h +++ b/arch/arm/mach-iop13xx/include/mach/timex.h @@ -1,3 +1,3 @@ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define CLOCK_TICK_RATE (100 * HZ) diff --git a/include/asm-arm/arch-iop13xx/uncompress.h b/arch/arm/mach-iop13xx/include/mach/uncompress.h index 5d4418decb86..fa4f80522fad 100644 --- a/include/asm-arm/arch-iop13xx/uncompress.h +++ b/arch/arm/mach-iop13xx/include/mach/uncompress.h @@ -1,6 +1,6 @@ #include <asm/types.h> #include <linux/serial_reg.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) diff --git a/include/asm-arm/arch-iop13xx/vmalloc.h b/arch/arm/mach-iop13xx/include/mach/vmalloc.h index c53456740345..c53456740345 100644 --- a/include/asm-arm/arch-iop13xx/vmalloc.h +++ b/arch/arm/mach-iop13xx/include/mach/vmalloc.h |