diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-lh7a40x/arch-kev7a400.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/clcd.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/clocks.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/clocks.h (renamed from include/asm-arm/arch-lh7a40x/clocks.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/constants.h (renamed from include/asm-arm/arch-lh7a40x/constants.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-lh7a40x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/dma.h (renamed from include/asm-arm/arch-lh7a40x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-lh7a40x/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/hardware.h (renamed from include/asm-arm/arch-lh7a40x/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/io.h (renamed from include/asm-arm/arch-lh7a40x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/irqs.h (renamed from include/asm-arm/arch-lh7a40x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/memory.h (renamed from include/asm-arm/arch-lh7a40x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/registers.h (renamed from include/asm-arm/arch-lh7a40x/registers.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/ssp.h (renamed from include/asm-arm/arch-lh7a40x/ssp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/system.h (renamed from include/asm-arm/arch-lh7a40x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/timex.h (renamed from include/asm-arm/arch-lh7a40x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/uncompress.h (renamed from include/asm-arm/arch-lh7a40x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/vmalloc.h (renamed from include/asm-arm/arch-lh7a40x/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a400.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a404.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/ssp-cpld.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/time.c | 2 |
24 files changed, 35 insertions, 35 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c index c794ca7a5f20..551b97261826 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c @@ -13,7 +13,7 @@ #include <linux/device.h> #include <linux/interrupt.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c index ff3109a00c2b..e373fb8e2699 100644 --- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c @@ -14,7 +14,7 @@ #include <linux/interrupt.h> #include <linux/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c index 395ad9b83c40..a2a543258fc3 100644 --- a/arch/arm/mach-lh7a40x/clcd.c +++ b/arch/arm/mach-lh7a40x/clcd.c @@ -23,7 +23,7 @@ #include <asm/mach/irq.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <linux/amba/bus.h> #include <linux/amba/clcd.h> diff --git a/arch/arm/mach-lh7a40x/clocks.c b/arch/arm/mach-lh7a40x/clocks.c index 9fe7f3a48949..4fb23ac6b5ac 100644 --- a/arch/arm/mach-lh7a40x/clocks.c +++ b/arch/arm/mach-lh7a40x/clocks.c @@ -9,8 +9,8 @@ */ #include <linux/cpufreq.h> -#include <asm/arch/hardware.h> -#include <asm/arch/clocks.h> +#include <mach/hardware.h> +#include <mach/clocks.h> #include <linux/err.h> struct module; diff --git a/include/asm-arm/arch-lh7a40x/clocks.h b/arch/arm/mach-lh7a40x/include/mach/clocks.h index 7d0ba18ad578..fe2e0255c084 100644 --- a/include/asm-arm/arch-lh7a40x/clocks.h +++ b/arch/arm/mach-lh7a40x/include/mach/clocks.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/clocks.h +/* arch/arm/mach-lh7a40x/include/mach/clocks.h * * Copyright (C) 2004 Marc Singer * diff --git a/include/asm-arm/arch-lh7a40x/constants.h b/arch/arm/mach-lh7a40x/include/mach/constants.h index 51de96e87faf..55c6edbc2dfd 100644 --- a/include/asm-arm/arch-lh7a40x/constants.h +++ b/arch/arm/mach-lh7a40x/include/mach/constants.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/constants.h +/* arch/arm/mach-lh7a40x/include/mach/constants.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development diff --git a/include/asm-arm/arch-lh7a40x/debug-macro.S b/arch/arm/mach-lh7a40x/include/mach/debug-macro.S index 421dcd6a8506..85141ed5383d 100644 --- a/include/asm-arm/arch-lh7a40x/debug-macro.S +++ b/arch/arm/mach-lh7a40x/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-lh7a40x/debug-macro.S +/* arch/arm/mach-lh7a40x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-lh7a40x/dma.h b/arch/arm/mach-lh7a40x/include/mach/dma.h index a8cbd14bbf9d..baa3f8dbd04b 100644 --- a/include/asm-arm/arch-lh7a40x/dma.h +++ b/arch/arm/mach-lh7a40x/include/mach/dma.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/dma.h +/* arch/arm/mach-lh7a40x/include/mach/dma.h * * Copyright (C) 2005 Marc Singer * diff --git a/include/asm-arm/arch-lh7a40x/entry-macro.S b/arch/arm/mach-lh7a40x/include/mach/entry-macro.S index 34468e064629..069bb4cefff7 100644 --- a/include/asm-arm/arch-lh7a40x/entry-macro.S +++ b/arch/arm/mach-lh7a40x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-lh7a40x/entry-macro.S + * arch/arm/mach-lh7a40x/include/mach/entry-macro.S * * Low-level IRQ helper macros for LH7A40x platforms * @@ -7,8 +7,8 @@ * 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 <asm/arch/irqs.h> +#include <mach/hardware.h> +#include <mach/irqs.h> /* In order to allow there to be support for both of the processor classes at the same time, we make a hack here that isn't very diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/arch/arm/mach-lh7a40x/include/mach/hardware.h index e9ff74fd7939..48e827d2fa56 100644 --- a/include/asm-arm/arch-lh7a40x/hardware.h +++ b/arch/arm/mach-lh7a40x/include/mach/hardware.h @@ -1,8 +1,8 @@ -/* include/asm-arm/arch-lh7a40x/hardware.h +/* arch/arm/mach-lh7a40x/include/mach/hardware.h * * Copyright (C) 2004 Coastal Environmental Systems * - * [ Substantially cribbed from include/asm-arm/arch-pxa/hardware.h ] + * [ Substantially cribbed from arch/arm/mach-pxa/include/mach/hardware.h ] * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/include/asm-arm/arch-lh7a40x/io.h b/arch/arm/mach-lh7a40x/include/mach/io.h index 8d591d0927c1..031d26f9163c 100644 --- a/include/asm-arm/arch-lh7a40x/io.h +++ b/arch/arm/mach-lh7a40x/include/mach/io.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/io.h +/* arch/arm/mach-lh7a40x/include/mach/io.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_IO_H #define __ASM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-lh7a40x/irqs.h b/arch/arm/mach-lh7a40x/include/mach/irqs.h index afe8c7cbad6a..0f9b83675935 100644 --- a/include/asm-arm/arch-lh7a40x/irqs.h +++ b/arch/arm/mach-lh7a40x/include/mach/irqs.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/irqs.h +/* arch/arm/mach-lh7a40x/include/mach/irqs.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h index 9b0c8012e713..f7107b4c197a 100644 --- a/include/asm-arm/arch-lh7a40x/memory.h +++ b/arch/arm/mach-lh7a40x/include/mach/memory.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/memory.h +/* arch/arm/mach-lh7a40x/include/mach/memory.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/include/asm-arm/arch-lh7a40x/registers.h b/arch/arm/mach-lh7a40x/include/mach/registers.h index b4f09b3e2d03..ea44396383a7 100644 --- a/include/asm-arm/arch-lh7a40x/registers.h +++ b/arch/arm/mach-lh7a40x/include/mach/registers.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/registers.h +/* arch/arm/mach-lh7a40x/include/mach/registers.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development @@ -9,7 +9,7 @@ * */ -#include <asm/arch/constants.h> +#include <mach/constants.h> #ifndef __ASM_ARCH_REGISTERS_H #define __ASM_ARCH_REGISTERS_H diff --git a/include/asm-arm/arch-lh7a40x/ssp.h b/arch/arm/mach-lh7a40x/include/mach/ssp.h index 132b1c4d5ce6..132b1c4d5ce6 100644 --- a/include/asm-arm/arch-lh7a40x/ssp.h +++ b/arch/arm/mach-lh7a40x/include/mach/ssp.h diff --git a/include/asm-arm/arch-lh7a40x/system.h b/arch/arm/mach-lh7a40x/include/mach/system.h index e1df8aa460f2..fa46bb1ef07b 100644 --- a/include/asm-arm/arch-lh7a40x/system.h +++ b/arch/arm/mach-lh7a40x/include/mach/system.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/system.h +/* arch/arm/mach-lh7a40x/include/mach/system.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/include/asm-arm/arch-lh7a40x/timex.h b/arch/arm/mach-lh7a40x/include/mach/timex.h index fa726b670829..08028cef1b3b 100644 --- a/include/asm-arm/arch-lh7a40x/timex.h +++ b/arch/arm/mach-lh7a40x/include/mach/timex.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/timex.h +/* arch/arm/mach-lh7a40x/include/mach/timex.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -8,7 +8,7 @@ * */ -#include <asm/arch/constants.h> +#include <mach/constants.h> #define CLOCK_TICK_RATE (PLL_CLOCK/6/16) diff --git a/include/asm-arm/arch-lh7a40x/uncompress.h b/arch/arm/mach-lh7a40x/include/mach/uncompress.h index 3d1ce0426a33..55b80d479eb4 100644 --- a/include/asm-arm/arch-lh7a40x/uncompress.h +++ b/arch/arm/mach-lh7a40x/include/mach/uncompress.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/uncompress.h +/* arch/arm/mach-lh7a40x/include/mach/uncompress.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -8,7 +8,7 @@ * */ -#include <asm/arch/registers.h> +#include <mach/registers.h> #ifndef UART_R_DATA # define UART_R_DATA (0x00) diff --git a/include/asm-arm/arch-lh7a40x/vmalloc.h b/arch/arm/mach-lh7a40x/include/mach/vmalloc.h index 8163e45109b9..3fbd49490bb9 100644 --- a/include/asm-arm/arch-lh7a40x/vmalloc.h +++ b/arch/arm/mach-lh7a40x/include/mach/vmalloc.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/vmalloc.h +/* arch/arm/mach-lh7a40x/include/mach/vmalloc.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c index 0e5a805036db..1ad3afcf6b3d 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a400.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c @@ -12,10 +12,10 @@ #include <linux/module.h> #include <linux/interrupt.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/irq.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include "common.h" diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c index f3293bfac8c6..12b045b688c6 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a404.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c @@ -12,10 +12,10 @@ #include <linux/module.h> #include <linux/interrupt.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/irq.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include "common.h" diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c index 41bf9f817b91..0d5063ebda10 100644 --- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c @@ -13,10 +13,10 @@ #include <linux/module.h> #include <linux/interrupt.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/irq.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include "common.h" diff --git a/arch/arm/mach-lh7a40x/ssp-cpld.c b/arch/arm/mach-lh7a40x/ssp-cpld.c index 4cd31bb8a8b8..51fbef9601b9 100644 --- a/arch/arm/mach-lh7a40x/ssp-cpld.c +++ b/arch/arm/mach-lh7a40x/ssp-cpld.c @@ -46,9 +46,9 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> -#include <asm/arch/ssp.h> +#include <mach/ssp.h> //#define TALK diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c index 1c7e469e3528..7fe9e06cf662 100644 --- a/arch/arm/mach-lh7a40x/time.c +++ b/arch/arm/mach-lh7a40x/time.c @@ -14,7 +14,7 @@ #include <linux/irq.h> #include <linux/time.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/leds.h> |