diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/adma.h (renamed from include/asm-arm/arch-iop33x/adma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop33x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/dma.h (renamed from include/asm-arm/arch-iop32x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop33x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/gpio.h (renamed from include/asm-arm/arch-iop33x/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/hardware.h (renamed from include/asm-arm/arch-iop33x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/io.h (renamed from include/asm-arm/arch-iop33x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iop33x.h (renamed from include/asm-arm/arch-iop33x/iop33x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iq80331.h (renamed from include/asm-arm/arch-iop33x/iq80331.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iq80332.h (renamed from include/asm-arm/arch-iop33x/iq80332.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/irqs.h (renamed from include/asm-arm/arch-iop33x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/memory.h (renamed from include/asm-arm/arch-iop33x/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/system.h (renamed from include/asm-arm/arch-iop33x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/time.h (renamed from include/asm-arm/arch-iop33x/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/timex.h (renamed from include/asm-arm/arch-iop33x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop33x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/iq80331.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/iq80332.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/uart.c | 2 |
21 files changed, 29 insertions, 24 deletions
diff --git a/include/asm-arm/arch-iop33x/adma.h b/arch/arm/mach-iop33x/include/mach/adma.h index 4b92f795f90e..4b92f795f90e 100644 --- a/include/asm-arm/arch-iop33x/adma.h +++ b/arch/arm/mach-iop33x/include/mach/adma.h diff --git a/include/asm-arm/arch-iop33x/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S index 9e7132ebe6a7..a60c9ef05cc3 100644 --- a/include/asm-arm/arch-iop33x/debug-macro.S +++ b/arch/arm/mach-iop33x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/debug-macro.S + * arch/arm/mach-iop33x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop32x/dma.h b/arch/arm/mach-iop33x/include/mach/dma.h index e977a9ef3160..d8b42232931d 100644 --- a/include/asm-arm/arch-iop32x/dma.h +++ b/arch/arm/mach-iop33x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/dma.h + * arch/arm/mach-iop33x/include/mach/dma.h * * Copyright (C) 2004 Intel Corp. * diff --git a/include/asm-arm/arch-iop33x/entry-macro.S b/arch/arm/mach-iop33x/include/mach/entry-macro.S index b8e3d449e882..4e1f7282b354 100644 --- a/include/asm-arm/arch-iop33x/entry-macro.S +++ b/arch/arm/mach-iop33x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/entry-macro.S + * arch/arm/mach-iop33x/include/mach/entry-macro.S * * Low-level IRQ helper macros for IOP33x-based platforms * @@ -7,7 +7,7 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <asm/arch/iop33x.h> +#include <mach/iop33x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-iop33x/gpio.h b/arch/arm/mach-iop33x/include/mach/gpio.h index ddd55bba9bb9..ddd55bba9bb9 100644 --- a/include/asm-arm/arch-iop33x/gpio.h +++ b/arch/arm/mach-iop33x/include/mach/gpio.h diff --git a/include/asm-arm/arch-iop33x/hardware.h b/arch/arm/mach-iop33x/include/mach/hardware.h index 0659cf94d040..8c10e430655e 100644 --- a/include/asm-arm/arch-iop33x/hardware.h +++ b/arch/arm/mach-iop33x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/hardware.h + * arch/arm/mach-iop33x/include/mach/hardware.h */ #ifndef __HARDWARE_H diff --git a/include/asm-arm/arch-iop33x/io.h b/arch/arm/mach-iop33x/include/mach/io.h index 3fc607c46f03..158874631217 100644 --- a/include/asm-arm/arch-iop33x/io.h +++ b/arch/arm/mach-iop33x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/io.h + * arch/arm/mach-iop33x/include/mach/io.h * * Copyright (C) 2001 MontaVista Software, Inc. * @@ -11,7 +11,7 @@ #ifndef __IO_H #define __IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, unsigned int mtype); diff --git a/include/asm-arm/arch-iop33x/iop33x.h b/arch/arm/mach-iop33x/include/mach/iop33x.h index 766985b9a723..24567316ec88 100644 --- a/include/asm-arm/arch-iop33x/iop33x.h +++ b/arch/arm/mach-iop33x/include/mach/iop33x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iop33x.h + * arch/arm/mach-iop33x/include/mach/iop33x.h * * Intel IOP33X Chip definitions * diff --git a/include/asm-arm/arch-iop33x/iq80331.h b/arch/arm/mach-iop33x/include/mach/iq80331.h index 79b9302017ea..fe406b0127f7 100644 --- a/include/asm-arm/arch-iop33x/iq80331.h +++ b/arch/arm/mach-iop33x/include/mach/iq80331.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iq80331.h + * arch/arm/mach-iop33x/include/mach/iq80331.h * * Intel IQ80331 evaluation board registers */ diff --git a/include/asm-arm/arch-iop33x/iq80332.h b/arch/arm/mach-iop33x/include/mach/iq80332.h index 053165629492..8325d71f2ed5 100644 --- a/include/asm-arm/arch-iop33x/iq80332.h +++ b/arch/arm/mach-iop33x/include/mach/iq80332.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iq80332.h + * arch/arm/mach-iop33x/include/mach/iq80332.h * * Intel IQ80332 evaluation board registers */ diff --git a/include/asm-arm/arch-iop33x/irqs.h b/arch/arm/mach-iop33x/include/mach/irqs.h index d045f8403396..707628a600ac 100644 --- a/include/asm-arm/arch-iop33x/irqs.h +++ b/arch/arm/mach-iop33x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/irqs.h + * arch/arm/mach-iop33x/include/mach/irqs.h * * Author: Dave Jiang (dave.jiang@intel.com) * Copyright: (C) 2003 Intel Corp. diff --git a/include/asm-arm/arch-iop33x/memory.h b/arch/arm/mach-iop33x/include/mach/memory.h index d798d83c83a5..2cef0bbb354f 100644 --- a/include/asm-arm/arch-iop33x/memory.h +++ b/arch/arm/mach-iop33x/include/mach/memory.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop33x/memory.h + * arch/arm/mach-iop33x/include/mach/memory.h */ #ifndef __MEMORY_H #define __MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-iop33x/system.h b/arch/arm/mach-iop33x/include/mach/system.h index 00dd07ece262..7bf3bfb49446 100644 --- a/include/asm-arm/arch-iop33x/system.h +++ b/arch/arm/mach-iop33x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/system.h + * arch/arm/mach-iop33x/include/mach/system.h * * Copyright (C) 2001 MontaVista Software, Inc. * diff --git a/include/asm-arm/arch-iop33x/time.h b/arch/arm/mach-iop33x/include/mach/time.h index 4ac4d7664f85..4ac4d7664f85 100644 --- a/include/asm-arm/arch-iop33x/time.h +++ b/arch/arm/mach-iop33x/include/mach/time.h diff --git a/include/asm-arm/arch-iop33x/timex.h b/arch/arm/mach-iop33x/include/mach/timex.h index 75a001e93daf..c75760844d49 100644 --- a/include/asm-arm/arch-iop33x/timex.h +++ b/arch/arm/mach-iop33x/include/mach/timex.h @@ -1,9 +1,9 @@ /* - * include/asm-arm/arch-iop33x/timex.h + * arch/arm/mach-iop33x/include/mach/timex.h * * IOP3xx architecture timex specifications */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define CLOCK_TICK_RATE (100 * HZ) diff --git a/include/asm-arm/arch-iop33x/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h index 34d9e8e8287a..b42423f63302 100644 --- a/include/asm-arm/arch-iop33x/uncompress.h +++ b/arch/arm/mach-iop33x/include/mach/uncompress.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop33x/uncompress.h + * arch/arm/mach-iop33x/include/mach/uncompress.h */ #include <asm/types.h> #include <asm/mach-types.h> #include <linux/serial_reg.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static volatile u32 *uart_base; diff --git a/arch/arm/mach-iop33x/include/mach/vmalloc.h b/arch/arm/mach-iop33x/include/mach/vmalloc.h new file mode 100644 index 000000000000..f9f99dea9bc4 --- /dev/null +++ b/arch/arm/mach-iop33x/include/mach/vmalloc.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-iop33x/include/mach/vmalloc.h + */ + +#define VMALLOC_END 0xfe000000 diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index e736c50ed3dc..c7d99f9fafed 100644 --- a/arch/arm/mach-iop33x/iq80331.c +++ b/arch/arm/mach-iop33x/iq80331.c @@ -22,7 +22,7 @@ #include <linux/serial_8250.h> #include <linux/mtd/physmap.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach/arch.h> @@ -32,7 +32,7 @@ #include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/arch/time.h> +#include <mach/time.h> /* * IQ80331 timer tick configuration. diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c index 75347a23ceb1..af616c5f4fb2 100644 --- a/arch/arm/mach-iop33x/iq80332.c +++ b/arch/arm/mach-iop33x/iq80332.c @@ -22,7 +22,7 @@ #include <linux/serial_8250.h> #include <linux/mtd/physmap.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach/arch.h> @@ -32,7 +32,7 @@ #include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/arch/time.h> +#include <mach/time.h> /* * IQ80332 timer tick configuration. diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c index 6ae1fac6c61a..abb4ea2ed4fd 100644 --- a/arch/arm/mach-iop33x/irq.c +++ b/arch/arm/mach-iop33x/irq.c @@ -16,7 +16,7 @@ #include <linux/list.h> #include <asm/mach/irq.h> #include <asm/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> static u32 iop33x_mask0; diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c index f11b86fc86c1..8c21870fa808 100644 --- a/arch/arm/mach-iop33x/uart.c +++ b/arch/arm/mach-iop33x/uart.c @@ -24,7 +24,7 @@ #include <asm/setup.h> #include <asm/system.h> #include <asm/memory.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iop3xx.h> #include <asm/mach/arch.h> |