diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/adma.h (renamed from include/asm-arm/arch-iop32x/adma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop32x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/dma.h (renamed from include/asm-arm/arch-iop33x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop32x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/glantank.h (renamed from include/asm-arm/arch-iop32x/glantank.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/gpio.h (renamed from include/asm-arm/arch-iop32x/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/hardware.h (renamed from include/asm-arm/arch-iop32x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/io.h (renamed from include/asm-arm/arch-iop32x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iop32x.h (renamed from include/asm-arm/arch-iop32x/iop32x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iq31244.h (renamed from include/asm-arm/arch-iop32x/iq31244.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iq80321.h (renamed from include/asm-arm/arch-iop32x/iq80321.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/irqs.h (renamed from include/asm-arm/arch-iop32x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/memory.h (renamed from include/asm-arm/arch-iop32x/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/n2100.h (renamed from include/asm-arm/arch-iop32x/n2100.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h (renamed from include/asm-arm/arch-iop32x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/time.h (renamed from include/asm-arm/arch-iop32x/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/timex.h (renamed from include/asm-arm/arch-iop32x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop32x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 |
19 files changed, 25 insertions, 20 deletions
diff --git a/include/asm-arm/arch-iop32x/adma.h b/arch/arm/mach-iop32x/include/mach/adma.h index 5ed92037dd10..5ed92037dd10 100644 --- a/include/asm-arm/arch-iop32x/adma.h +++ b/arch/arm/mach-iop32x/include/mach/adma.h diff --git a/include/asm-arm/arch-iop32x/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S index 9022b6849e23..58b01664ffba 100644 --- a/include/asm-arm/arch-iop32x/debug-macro.S +++ b/arch/arm/mach-iop32x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/debug-macro.S + * arch/arm/mach-iop32x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop33x/dma.h b/arch/arm/mach-iop32x/include/mach/dma.h index b7775fdc5ad3..f8bd817f205d 100644 --- a/include/asm-arm/arch-iop33x/dma.h +++ b/arch/arm/mach-iop32x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/dma.h + * arch/arm/mach-iop32x/include/mach/dma.h * * Copyright (C) 2004 Intel Corp. * diff --git a/include/asm-arm/arch-iop32x/entry-macro.S b/arch/arm/mach-iop32x/include/mach/entry-macro.S index 207db99dfbd2..b02fb56bafcc 100644 --- a/include/asm-arm/arch-iop32x/entry-macro.S +++ b/arch/arm/mach-iop32x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/entry-macro.S + * arch/arm/mach-iop32x/include/mach/entry-macro.S * * Low-level IRQ helper macros for IOP32x-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/iop32x.h> +#include <mach/iop32x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-iop32x/glantank.h b/arch/arm/mach-iop32x/include/mach/glantank.h index bf0665acc1c1..958eb91c0913 100644 --- a/include/asm-arm/arch-iop32x/glantank.h +++ b/arch/arm/mach-iop32x/include/mach/glantank.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/glantank.h + * arch/arm/mach-iop32x/include/mach/glantank.h * * IO-Data GLAN Tank board registers */ diff --git a/include/asm-arm/arch-iop32x/gpio.h b/arch/arm/mach-iop32x/include/mach/gpio.h index 708f4ec9db1d..708f4ec9db1d 100644 --- a/include/asm-arm/arch-iop32x/gpio.h +++ b/arch/arm/mach-iop32x/include/mach/gpio.h diff --git a/include/asm-arm/arch-iop32x/hardware.h b/arch/arm/mach-iop32x/include/mach/hardware.h index 6556ed5eee31..d559c4e6095a 100644 --- a/include/asm-arm/arch-iop32x/hardware.h +++ b/arch/arm/mach-iop32x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/hardware.h + * arch/arm/mach-iop32x/include/mach/hardware.h */ #ifndef __HARDWARE_H diff --git a/include/asm-arm/arch-iop32x/io.h b/arch/arm/mach-iop32x/include/mach/io.h index 47b2736236e4..ce54705ba3d4 100644 --- a/include/asm-arm/arch-iop32x/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/io.h + * arch/arm/mach-iop32x/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-iop32x/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h index 0d8af57221a1..abd9eb49f103 100644 --- a/include/asm-arm/arch-iop32x/iop32x.h +++ b/arch/arm/mach-iop32x/include/mach/iop32x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iop32x.h + * arch/arm/mach-iop32x/include/mach/iop32x.h * * Intel IOP32X Chip definitions * diff --git a/include/asm-arm/arch-iop32x/iq31244.h b/arch/arm/mach-iop32x/include/mach/iq31244.h index fff4eafa1f6b..6b6b369e781c 100644 --- a/include/asm-arm/arch-iop32x/iq31244.h +++ b/arch/arm/mach-iop32x/include/mach/iq31244.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iq31244.h + * arch/arm/mach-iop32x/include/mach/iq31244.h * * Intel IQ31244 evaluation board registers */ diff --git a/include/asm-arm/arch-iop32x/iq80321.h b/arch/arm/mach-iop32x/include/mach/iq80321.h index eb69db9b9a06..498819b737e7 100644 --- a/include/asm-arm/arch-iop32x/iq80321.h +++ b/arch/arm/mach-iop32x/include/mach/iq80321.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iq80321.h + * arch/arm/mach-iop32x/include/mach/iq80321.h * * Intel IQ80321 evaluation board registers */ diff --git a/include/asm-arm/arch-iop32x/irqs.h b/arch/arm/mach-iop32x/include/mach/irqs.h index bbaef873afce..33573e09914c 100644 --- a/include/asm-arm/arch-iop32x/irqs.h +++ b/arch/arm/mach-iop32x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/irqs.h + * arch/arm/mach-iop32x/include/mach/irqs.h * * Author: Rory Bolt <rorybolt@pacbell.net> * Copyright: (C) 2002 Rory Bolt diff --git a/include/asm-arm/arch-iop32x/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h index bdcf03895ee0..42cd4bf3148c 100644 --- a/include/asm-arm/arch-iop32x/memory.h +++ b/arch/arm/mach-iop32x/include/mach/memory.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop32x/memory.h + * arch/arm/mach-iop32x/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-iop32x/n2100.h b/arch/arm/mach-iop32x/include/mach/n2100.h index 77a8af476629..40b8a532b064 100644 --- a/include/asm-arm/arch-iop32x/n2100.h +++ b/arch/arm/mach-iop32x/include/mach/n2100.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/n2100.h + * arch/arm/mach-iop32x/include/mach/n2100.h * * Thecus N2100 board registers */ diff --git a/include/asm-arm/arch-iop32x/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 17b7eb7e9c0d..20f923e54f46 100644 --- a/include/asm-arm/arch-iop32x/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/system.h + * arch/arm/mach-iop32x/include/mach/system.h * * Copyright (C) 2001 MontaVista Software, Inc. * diff --git a/include/asm-arm/arch-iop32x/time.h b/arch/arm/mach-iop32x/include/mach/time.h index 0f28c9949623..0f28c9949623 100644 --- a/include/asm-arm/arch-iop32x/time.h +++ b/arch/arm/mach-iop32x/include/mach/time.h diff --git a/include/asm-arm/arch-iop32x/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h index 445704619825..a541afced3cb 100644 --- a/include/asm-arm/arch-iop32x/timex.h +++ b/arch/arm/mach-iop32x/include/mach/timex.h @@ -1,9 +1,9 @@ /* - * include/asm-arm/arch-iop32x/timex.h + * arch/arm/mach-iop32x/include/mach/timex.h * * IOP32x 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-iop32x/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index 07028786394e..b247551b6f5a 100644 --- a/include/asm-arm/arch-iop32x/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop32x/uncompress.h + * arch/arm/mach-iop32x/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 u8 *uart_base; diff --git a/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h new file mode 100644 index 000000000000..85ceb09d85f0 --- /dev/null +++ b/arch/arm/mach-iop32x/include/mach/vmalloc.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-iop32x/include/mach/vmalloc.h + */ + +#define VMALLOC_END 0xfe000000 |