diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 16:14:15 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:55:48 +0100 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/mach-msm | |
parent | Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 (diff) | |
download | linux-dev-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.xz linux-dev-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.zip |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-msm/common.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/idle.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/board.h (renamed from include/asm-arm/arch-msm/board.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S (renamed from include/asm-arm/arch-msm/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/dma.h (renamed from include/asm-arm/arch-msm/dma.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/entry-macro.S (renamed from include/asm-arm/arch-msm/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/hardware.h (renamed from include/asm-arm/arch-msm/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/io.h (renamed from include/asm-arm/arch-msm/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/irqs.h (renamed from include/asm-arm/arch-msm/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/memory.h (renamed from include/asm-arm/arch-msm/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h (renamed from include/asm-arm/arch-msm/msm_iomap.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/system.h (renamed from include/asm-arm/arch-msm/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/timex.h (renamed from include/asm-arm/arch-msm/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/uncompress.h (renamed from include/asm-arm/arch-msm/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/vmalloc.h (renamed from include/asm-arm/arch-msm/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/io.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-msm/irq.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
20 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index 46460218a208..995afc4ade4b 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c @@ -19,14 +19,14 @@ #include <linux/platform_device.h> #include <linux/input.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/flash.h> -#include <asm/arch/board.h> -#include <asm/arch/msm_iomap.h> +#include <mach/board.h> +#include <mach/msm_iomap.h> #include <asm/io.h> #include <asm/delay.h> diff --git a/arch/arm/mach-msm/common.c b/arch/arm/mach-msm/common.c index 3f5d3362f887..3a511368a5d8 100644 --- a/arch/arm/mach-msm/common.c +++ b/arch/arm/mach-msm/common.c @@ -28,9 +28,9 @@ #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> -#include <asm/arch/board.h> +#include <mach/board.h> struct flash_platform_data msm_nand_data = { .parts = 0, diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c index 8b0f339b3274..9de08265d974 100644 --- a/arch/arm/mach-msm/dma.c +++ b/arch/arm/mach-msm/dma.c @@ -15,7 +15,7 @@ #include <asm/io.h> #include <linux/interrupt.h> -#include <asm/arch/dma.h> +#include <mach/dma.h> #define MSM_DMOV_CHANNEL_COUNT 16 diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S index 2b1cb7f16943..6a94f0527137 100644 --- a/arch/arm/mach-msm/idle.S +++ b/arch/arm/mach-msm/idle.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/idle.S +/* arch/arm/mach-msm/include/mach/idle.S * * Idle processing for MSM7K - work around bugs with SWFI. * diff --git a/include/asm-arm/arch-msm/board.h b/arch/arm/mach-msm/include/mach/board.h index 763051f8ba14..a7639493c095 100644 --- a/include/asm-arm/arch-msm/board.h +++ b/arch/arm/mach-msm/include/mach/board.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/board.h +/* arch/arm/mach-msm/include/mach/board.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index e131b44b2107..528eef4b605c 100644 --- a/include/asm-arm/arch-msm/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm7200/debug-macro.S +/* arch/arm/mach-msm7200/include/mach/debug-macro.S * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> @@ -14,8 +14,8 @@ * */ -#include <asm/arch/hardware.h> -#include <asm/arch/msm_iomap.h> +#include <mach/hardware.h> +#include <mach/msm_iomap.h> .macro addruart,rx @ see if the MMU is enabled and select appropriate base address diff --git a/include/asm-arm/arch-msm/dma.h b/arch/arm/mach-msm/include/mach/dma.h index e4b565b27b35..ad1c87f86d10 100644 --- a/include/asm-arm/arch-msm/dma.h +++ b/arch/arm/mach-msm/include/mach/dma.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/dma.h +/* arch/arm/mach-msm/include/mach/dma.h * * Copyright (C) 2007 Google, Inc. * @@ -16,7 +16,7 @@ #ifndef __ASM_ARCH_MSM_DMA_H #include <linux/list.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> struct msm_dmov_cmd { struct list_head list; diff --git a/include/asm-arm/arch-msm/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S index ee24aece4cb0..d2259486bcb1 100644 --- a/include/asm-arm/arch-msm/entry-macro.S +++ b/arch/arm/mach-msm/include/mach/entry-macro.S @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm7200/entry-macro.S +/* arch/arm/mach-msm7200/include/mach/entry-macro.S * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> @@ -14,7 +14,7 @@ * */ -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-msm/hardware.h b/arch/arm/mach-msm/include/mach/hardware.h index 89af2b70182f..2d126091ae41 100644 --- a/include/asm-arm/arch-msm/hardware.h +++ b/arch/arm/mach-msm/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/hardware.h +/* arch/arm/mach-msm/include/mach/hardware.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/io.h b/arch/arm/mach-msm/include/mach/io.h index 4645ae26b62a..c6a2feb268b0 100644 --- a/include/asm-arm/arch-msm/io.h +++ b/arch/arm/mach-msm/include/mach/io.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm/io.h +/* arch/arm/mach-msm/include/mach/io.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/irqs.h b/arch/arm/mach-msm/include/mach/irqs.h index e62a108b1857..9dd4cf8a2693 100644 --- a/include/asm-arm/arch-msm/irqs.h +++ b/arch/arm/mach-msm/include/mach/irqs.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/irqs.h +/* arch/arm/mach-msm/include/mach/irqs.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/memory.h b/arch/arm/mach-msm/include/mach/memory.h index b5ce0e9ac86d..63fd47f2e62e 100644 --- a/include/asm-arm/arch-msm/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/memory.h +/* arch/arm/mach-msm/include/mach/memory.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index b8955cc26fec..e221f58ceea3 100644 --- a/include/asm-arm/arch-msm/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/msm_iomap.h +/* arch/arm/mach-msm/include/mach/msm_iomap.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/system.h b/arch/arm/mach-msm/include/mach/system.h index fb31b3aa6750..f05ad2e0f235 100644 --- a/include/asm-arm/arch-msm/system.h +++ b/arch/arm/mach-msm/include/mach/system.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/system.h +/* arch/arm/mach-msm/include/mach/system.h * * Copyright (C) 2007 Google, Inc. * @@ -13,7 +13,7 @@ * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> void arch_idle(void); diff --git a/include/asm-arm/arch-msm/timex.h b/arch/arm/mach-msm/include/mach/timex.h index 8724487ab4c9..a62e6b215aec 100644 --- a/include/asm-arm/arch-msm/timex.h +++ b/arch/arm/mach-msm/include/mach/timex.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/timex.h +/* arch/arm/mach-msm/include/mach/timex.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h index e91ed786ffec..026e8955ace9 100644 --- a/include/asm-arm/arch-msm/uncompress.h +++ b/arch/arm/mach-msm/include/mach/uncompress.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/uncompress.h +/* arch/arm/mach-msm/include/mach/uncompress.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/vmalloc.h b/arch/arm/mach-msm/include/mach/vmalloc.h index 60f8d910e825..05f81fd8623c 100644 --- a/include/asm-arm/arch-msm/vmalloc.h +++ b/arch/arm/mach-msm/include/mach/vmalloc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/vmalloc.h +/* arch/arm/mach-msm/include/mach/vmalloc.h * * Copyright (C) 2007 Google, Inc. * diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index eca4283bbcb2..5976200de99b 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@ -19,13 +19,13 @@ #include <linux/kernel.h> #include <linux/init.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/page.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> #include <asm/mach/map.h> -#include <asm/arch/board.h> +#include <mach/board.h> #define MSM_DEVICE(name) { \ .virtual = MSM_##name##_BASE, \ diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c index 0535b39261f0..66901baf8c8e 100644 --- a/arch/arm/mach-msm/irq.c +++ b/arch/arm/mach-msm/irq.c @@ -21,11 +21,11 @@ #include <linux/timer.h> #include <linux/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> #define VIC_REG(off) (MSM_VIC_BASE + (off)) diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index bd4732d1ab3e..9f02d7dca985 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -22,7 +22,7 @@ #include <linux/delay.h> #include <asm/mach/time.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> #include <asm/io.h> |