diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-l7200/include/mach/aux_reg.h (renamed from include/asm-arm/arch-l7200/aux_reg.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/debug-macro.S (renamed from include/asm-arm/arch-l7200/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/dma.h (renamed from include/asm-arm/arch-l7200/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/entry-macro.S (renamed from include/asm-arm/arch-l7200/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/gp_timers.h (renamed from include/asm-arm/arch-l7200/gp_timers.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/gpio.h (renamed from include/asm-arm/arch-l7200/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/hardware.h (renamed from include/asm-arm/arch-l7200/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/io.h (renamed from include/asm-arm/arch-l7200/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/irqs.h (renamed from include/asm-arm/arch-l7200/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/memory.h (renamed from include/asm-arm/arch-l7200/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/pmpcon.h (renamed from include/asm-arm/arch-l7200/pmpcon.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/pmu.h (renamed from include/asm-arm/arch-l7200/pmu.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/serial.h (renamed from include/asm-arm/arch-l7200/serial.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/serial_l7200.h (renamed from include/asm-arm/arch-l7200/serial_l7200.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/sib.h (renamed from include/asm-arm/arch-l7200/sib.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/sys-clock.h (renamed from include/asm-arm/arch-l7200/sys-clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/system.h (renamed from include/asm-arm/arch-l7200/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/time.h (renamed from include/asm-arm/arch-l7200/time.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/timex.h (renamed from include/asm-arm/arch-l7200/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/uncompress.h (renamed from include/asm-arm/arch-l7200/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/vmalloc.h (renamed from include/asm-arm/arch-l7200/vmalloc.h) | 2 |
21 files changed, 30 insertions, 30 deletions
diff --git a/include/asm-arm/arch-l7200/aux_reg.h b/arch/arm/mach-l7200/include/mach/aux_reg.h index 762cbc76c501..4671558cdd51 100644 --- a/include/asm-arm/arch-l7200/aux_reg.h +++ b/arch/arm/mach-l7200/include/mach/aux_reg.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/aux_reg.h + * arch/arm/mach-l7200/include/mach/aux_reg.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ #ifndef _ASM_ARCH_AUXREG_H #define _ASM_ARCH_AUXREG_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) diff --git a/include/asm-arm/arch-l7200/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S index 846473318e8b..34eed2a63e69 100644 --- a/include/asm-arm/arch-l7200/debug-macro.S +++ b/arch/arm/mach-l7200/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-l7200/debug-macro.S +/* arch/arm/mach-l7200/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-l7200/dma.h b/arch/arm/mach-l7200/include/mach/dma.h index 4c7eca63f035..c7e48bd4590c 100644 --- a/include/asm-arm/arch-l7200/dma.h +++ b/arch/arm/mach-l7200/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/dma.h + * arch/arm/mach-l7200/include/mach/dma.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * diff --git a/include/asm-arm/arch-l7200/entry-macro.S b/arch/arm/mach-l7200/include/mach/entry-macro.S index d5e7294df1d5..1726d91fc1d3 100644 --- a/include/asm-arm/arch-l7200/entry-macro.S +++ b/arch/arm/mach-l7200/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-l7200/entry-macro.S + * arch/arm/mach-l7200/include/mach/entry-macro.S * * Low-level IRQ helper macros for L7200-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/hardware.h> +#include <mach/hardware.h> .equ irq_base_addr, IO_BASE_2 diff --git a/include/asm-arm/arch-l7200/gp_timers.h b/arch/arm/mach-l7200/include/mach/gp_timers.h index 6f20962df248..2b7086a26b81 100644 --- a/include/asm-arm/arch-l7200/gp_timers.h +++ b/arch/arm/mach-l7200/include/mach/gp_timers.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/gp_timers.h + * arch/arm/mach-l7200/include/mach/gp_timers.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -10,7 +10,7 @@ #ifndef _ASM_ARCH_GPTIMERS_H #define _ASM_ARCH_GPTIMERS_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Layout of L7200 general purpose timer registers diff --git a/include/asm-arm/arch-l7200/gpio.h b/arch/arm/mach-l7200/include/mach/gpio.h index 0b63e4239bdd..c7b0a5d7b8bb 100644 --- a/include/asm-arm/arch-l7200/gpio.h +++ b/arch/arm/mach-l7200/include/mach/gpio.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/gpio.h + * arch/arm/mach-l7200/include/mach/gpio.h * * Registers and helper functions for the L7200 Link-Up Systems * GPIO. diff --git a/include/asm-arm/arch-l7200/hardware.h b/arch/arm/mach-l7200/include/mach/hardware.h index 2ab43f3a4a8d..c31909cfc254 100644 --- a/include/asm-arm/arch-l7200/hardware.h +++ b/arch/arm/mach-l7200/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/hardware.h + * arch/arm/mach-l7200/include/mach/hardware.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/io.h b/arch/arm/mach-l7200/include/mach/io.h index e24a10a7ed8c..d432ba9e5dff 100644 --- a/include/asm-arm/arch-l7200/io.h +++ b/arch/arm/mach-l7200/include/mach/io.h @@ -1,16 +1,16 @@ /* - * linux/include/asm-arm/arch-l7200/io.h + * arch/arm/mach-l7200/include/mach/io.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * * Changelog: - * 03-21-2000 SJH Created from linux/include/asm-arm/arch-nexuspci/io.h + * 03-21-2000 SJH Created from arch/arm/mach-nexuspci/include/mach/io.h * 08-31-2000 SJH Added in IO functions necessary for new drivers */ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-l7200/irqs.h b/arch/arm/mach-l7200/include/mach/irqs.h index 7120c016e29e..7edffd713c5b 100644 --- a/include/asm-arm/arch-l7200/irqs.h +++ b/arch/arm/mach-l7200/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-l7200/irqs.h + * arch/arm/mach-l7200/include/mach/irqs.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/memory.h b/arch/arm/mach-l7200/include/mach/memory.h index 402df637e740..f338cf3ffd93 100644 --- a/include/asm-arm/arch-l7200/memory.h +++ b/arch/arm/mach-l7200/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/memory.h + * arch/arm/mach-l7200/include/mach/memory.h * * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) diff --git a/include/asm-arm/arch-l7200/pmpcon.h b/arch/arm/mach-l7200/include/mach/pmpcon.h index 730056c194be..3959871e8361 100644 --- a/include/asm-arm/arch-l7200/pmpcon.h +++ b/arch/arm/mach-l7200/include/mach/pmpcon.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/pmpcon.h + * arch/arm/mach-l7200/include/mach/pmpcon.h * * Registers and helper functions for the L7200 Link-Up Systems * DC/DC converter register. diff --git a/include/asm-arm/arch-l7200/pmu.h b/arch/arm/mach-l7200/include/mach/pmu.h index 57faea76d1b3..a2da7aedf208 100644 --- a/include/asm-arm/arch-l7200/pmu.h +++ b/arch/arm/mach-l7200/include/mach/pmu.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/pmu.h + * arch/arm/mach-l7200/include/mach/pmu.h * * Registers and helper functions for the L7200 Link-Up Systems * Power Management Unit (PMU). diff --git a/include/asm-arm/arch-l7200/serial.h b/arch/arm/mach-l7200/include/mach/serial.h index defb8b7fca73..adc05e5f8378 100644 --- a/include/asm-arm/arch-l7200/serial.h +++ b/arch/arm/mach-l7200/include/mach/serial.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/serial.h + * arch/arm/mach-l7200/include/mach/serial.h * * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/serial_l7200.h b/arch/arm/mach-l7200/include/mach/serial_l7200.h index b1008a9d23e5..645f1c5e568d 100644 --- a/include/asm-arm/arch-l7200/serial_l7200.h +++ b/arch/arm/mach-l7200/include/mach/serial_l7200.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/serial_l7200.h + * arch/arm/mach-l7200/include/mach/serial_l7200.h * * Copyright (c) 2000 Steven Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ #ifndef __ASM_ARCH_SERIAL_L7200_H #define __ASM_ARCH_SERIAL_L7200_H -#include <asm/arch/memory.h> +#include <mach/memory.h> /* * This assumes you have a 3.6864 MHz clock for your UART. diff --git a/include/asm-arm/arch-l7200/sib.h b/arch/arm/mach-l7200/include/mach/sib.h index bf4364ee2535..965728712cf3 100644 --- a/include/asm-arm/arch-l7200/sib.h +++ b/arch/arm/mach-l7200/include/mach/sib.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/sib.h + * arch/arm/mach-l7200/include/mach/sib.h * * Registers and helper functions for the Serial Interface Bus. * diff --git a/include/asm-arm/arch-l7200/sys-clock.h b/arch/arm/mach-l7200/include/mach/sys-clock.h index 771c774f4815..2d7722be60ea 100644 --- a/include/asm-arm/arch-l7200/sys-clock.h +++ b/arch/arm/mach-l7200/include/mach/sys-clock.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/sys-clock.h + * arch/arm/mach-l7200/include/mach/sys-clock.h * * Registers and helper functions for the L7200 Link-Up Systems * System clocks. diff --git a/include/asm-arm/arch-l7200/system.h b/arch/arm/mach-l7200/include/mach/system.h index efef950a5b5d..5272abee0d0e 100644 --- a/include/asm-arm/arch-l7200/system.h +++ b/arch/arm/mach-l7200/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/system.h + * arch/arm/mach-l7200/include/mach/system.h * * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-l7200/time.h b/arch/arm/mach-l7200/include/mach/time.h index ea22f7fff9cd..061771c2c2bd 100644 --- a/include/asm-arm/arch-l7200/time.h +++ b/arch/arm/mach-l7200/include/mach/time.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/time.h + * arch/arm/mach-l7200/include/mach/time.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) @@ -11,7 +11,7 @@ #ifndef _ASM_ARCH_TIME_H #define _ASM_ARCH_TIME_H -#include <asm/arch/irqs.h> +#include <mach/irqs.h> /* * RTC base register address diff --git a/include/asm-arm/arch-l7200/timex.h b/arch/arm/mach-l7200/include/mach/timex.h index 3c3202620f00..ffc96a63b5a2 100644 --- a/include/asm-arm/arch-l7200/timex.h +++ b/arch/arm/mach-l7200/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/timex.h + * arch/arm/mach-l7200/include/mach/timex.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/uncompress.h b/arch/arm/mach-l7200/include/mach/uncompress.h index c5ba0adf4a5d..591c962bb315 100644 --- a/include/asm-arm/arch-l7200/uncompress.h +++ b/arch/arm/mach-l7200/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/uncompress.h + * arch/arm/mach-l7200/include/mach/uncompress.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ * 07-26-2000 SJH Removed hard coded baud rate */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_UART IO_START + 0x00044000 diff --git a/include/asm-arm/arch-l7200/vmalloc.h b/arch/arm/mach-l7200/include/mach/vmalloc.h index 816231eedaac..85f0abbf15f1 100644 --- a/include/asm-arm/arch-l7200/vmalloc.h +++ b/arch/arm/mach-l7200/include/mach/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-l7200/vmalloc.h + * arch/arm/mach-l7200/include/mach/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x10000000) |