diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-07-28 23:09:44 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-07-28 23:09:44 (GMT) |
commit | f15cbe6f1a4b4d9df59142fc8e4abb973302cf44 (patch) | |
tree | 774d7b11abaaf33561ab8268bf51ddd9ceb79025 /arch/sh/boards | |
parent | 25326277d8d1393d1c66240e6255aca780f9e3eb (diff) | |
download | linux-fsl-qoriq-f15cbe6f1a4b4d9df59142fc8e4abb973302cf44.tar.xz |
sh: migrate to arch/sh/include/
This follows the sparc changes a439fe51a1f8eb087c22dd24d69cebae4a3addac.
Most of the moving about was done with Sam's directions at:
http://marc.info/?l=linux-sh&m=121724823706062&w=2
with subsequent hacking and fixups entirely my fault.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/cayman/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/cayman/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/dreamcast/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/dreamcast/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/pm.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/pm_wakeup.S | 2 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/gio.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/landisk/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/psw.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/psw.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/se/7343/io.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/se/7343/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/sh03/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/snapgear/setup.c | 2 |
16 files changed, 20 insertions, 20 deletions
diff --git a/arch/sh/boards/cayman/irq.c b/arch/sh/boards/cayman/irq.c index 30ec7be..ceb37ae 100644 --- a/arch/sh/boards/cayman/irq.c +++ b/arch/sh/boards/cayman/irq.c @@ -13,7 +13,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/signal.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #include <asm/page.h> /* Setup for the SMSC FDC37C935 / LAN91C100FD */ diff --git a/arch/sh/boards/cayman/setup.c b/arch/sh/boards/cayman/setup.c index 8c9fa47..e7f9cc5 100644 --- a/arch/sh/boards/cayman/setup.c +++ b/arch/sh/boards/cayman/setup.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> /* * Platform Dependent Interrupt Priorities. diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/dreamcast/irq.c index 9d0673a..67bdc33 100644 --- a/arch/sh/boards/dreamcast/irq.c +++ b/arch/sh/boards/dreamcast/irq.c @@ -12,7 +12,7 @@ #include <linux/irq.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/dreamcast/sysasic.h> +#include <mach/sysasic.h> /* Dreamcast System ASIC Hardware Events - diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c index 2581c8c..14c3e57 100644 --- a/arch/sh/boards/dreamcast/setup.c +++ b/arch/sh/boards/dreamcast/setup.c @@ -25,8 +25,8 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/rtc.h> -#include <asm/machvec.h> -#include <asm/mach/sysasic.h> +#include <machvec.h> +#include <mach/sysasic.h> extern struct hw_interrupt_type systemasic_int; extern void aica_time_init(void); diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c index d22f6ea..e96684d 100644 --- a/arch/sh/boards/hp6xx/pm.c +++ b/arch/sh/boards/hp6xx/pm.c @@ -13,7 +13,7 @@ #include <asm/io.h> #include <asm/hd64461.h> #include <asm/hp6xx.h> -#include <asm/cpu/dac.h> +#include <cpu/dac.h> #include <asm/pm.h> #define STBCR 0xffffff82 diff --git a/arch/sh/boards/hp6xx/pm_wakeup.S b/arch/sh/boards/hp6xx/pm_wakeup.S index 45e9bf0..44b648c 100644 --- a/arch/sh/boards/hp6xx/pm_wakeup.S +++ b/arch/sh/boards/hp6xx/pm_wakeup.S @@ -8,7 +8,7 @@ */ #include <linux/linkage.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #define k0 r0 #define k1 r1 diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 2f414ac..475b46c 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c @@ -16,7 +16,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/hp6xx.h> -#include <asm/cpu/dac.h> +#include <cpu/dac.h> #define SCPCR 0xa4000116 #define SCPDR 0xa4000136 diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/landisk/gio.c index 0c15b0a..edcde08 100644 --- a/arch/sh/boards/landisk/gio.c +++ b/arch/sh/boards/landisk/gio.c @@ -20,8 +20,8 @@ #include <linux/fs.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/landisk/gio.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/gio.h> +#include <mach/iodata_landisk.h> #define DEVCOUNT 4 #define GIO_MINOR 2 /* GIO minor no. */ diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c index 2586494..d0f9378 100644 --- a/arch/sh/boards/landisk/irq.c +++ b/arch/sh/boards/landisk/irq.c @@ -16,7 +16,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/io.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> static void disable_landisk_irq(unsigned int irq) { diff --git a/arch/sh/boards/landisk/psw.c b/arch/sh/boards/landisk/psw.c index 5a9b70b..4bd502c 100644 --- a/arch/sh/boards/landisk/psw.c +++ b/arch/sh/boards/landisk/psw.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> #include <asm/push-switch.h> static irqreturn_t psw_irq_handler(int irq, void *arg) diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c index 2b708ec..470c781 100644 --- a/arch/sh/boards/landisk/setup.c +++ b/arch/sh/boards/landisk/setup.c @@ -18,7 +18,7 @@ #include <linux/pm.h> #include <linux/mm.h> #include <asm/machvec.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> #include <asm/io.h> void init_landisk_IRQ(void); diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/renesas/r7780rp/psw.c index c844dfa..0b3e062 100644 --- a/arch/sh/boards/renesas/r7780rp/psw.c +++ b/arch/sh/boards/renesas/r7780rp/psw.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/mach/r7780rp.h> +#include <mach/r7780rp.h> #include <asm/push-switch.h> static irqreturn_t psw_irq_handler(int irq, void *arg) diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/se/7343/io.c index 3a6d114..e2fae32 100644 --- a/arch/sh/boards/se/7343/io.c +++ b/arch/sh/boards/se/7343/io.c @@ -6,7 +6,7 @@ */ #include <linux/kernel.h> #include <asm/io.h> -#include <asm/mach/se7343.h> +#include <mach/se7343.h> #define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a) diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c index 8ae718d..59dc92e 100644 --- a/arch/sh/boards/se/7343/setup.c +++ b/arch/sh/boards/se/7343/setup.c @@ -1,8 +1,8 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/physmap.h> -#include <asm/machvec.h> -#include <asm/mach/se7343.h> +#include <machvec.h> +#include <mach/se7343.h> #include <asm/heartbeat.h> #include <asm/irq.h> #include <asm/io.h> diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 934ac4f1..cd9cff1 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -11,8 +11,8 @@ #include <linux/platform_device.h> #include <asm/io.h> #include <asm/rtc.h> -#include <asm/sh03/io.h> -#include <asm/sh03/sh03.h> +#include <mach/io.h> +#include <mach/sh03.h> #include <asm/addrspace.h> static void __init init_sh03_IRQ(void) diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c index 7022483..a5e349d 100644 --- a/arch/sh/boards/snapgear/setup.c +++ b/arch/sh/boards/snapgear/setup.c @@ -22,7 +22,7 @@ #include <asm/snapgear.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/cpu/timer.h> +#include <cpu/timer.h> /* * EraseConfig handling functions |