diff options
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/board-magicpanelr2.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/lcd_qvga.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/sh7203.h (renamed from arch/sh/include/asm/sh7203.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/sh7720.h (renamed from arch/sh/include/asm/sh7720.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/sh7722.h (renamed from arch/sh/include/asm/sh7722.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/sh7723.h (renamed from arch/sh/include/asm/sh7723.h) | 0 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 2 |
11 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 84fa8a04eac..7c7874e6ac3 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c @@ -24,7 +24,7 @@ #include <video/sh_mobile_lcdc.h> #include <asm/io.h> #include <asm/clock.h> -#include <asm/sh7723.h> +#include <cpu/sh7723.h> static struct smc911x_platdata smc911x_info = { .flags = SMC911X_USE_32BIT, diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c index eb0e8e992c2..da6bff83a6e 100644 --- a/arch/sh/boards/board-magicpanelr2.c +++ b/arch/sh/boards/board-magicpanelr2.c @@ -20,7 +20,7 @@ #include <linux/mtd/map.h> #include <asm/magicpanelr2.h> #include <asm/heartbeat.h> -#include <asm/sh7720.h> +#include <cpu/sh7720.h> #define LAN9115_READY (ctrl_inl(0xA8000084UL) & 0x00000001UL) diff --git a/arch/sh/boards/mach-migor/lcd_qvga.c b/arch/sh/boards/mach-migor/lcd_qvga.c index c283cfc2a5c..71a40710a5a 100644 --- a/arch/sh/boards/mach-migor/lcd_qvga.c +++ b/arch/sh/boards/mach-migor/lcd_qvga.c @@ -19,7 +19,7 @@ #include <linux/module.h> #include <linux/gpio.h> #include <video/sh_mobile_lcdc.h> -#include <asm/sh7722.h> +#include <cpu/sh7722.h> #include <asm/migor.h> /* LCD Module is a PH240320T according to board schematics. This module diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 3e3cc9da34a..d00cce04d6e 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -26,7 +26,7 @@ #include <asm/io.h> #include <asm/sh_keysc.h> #include <asm/migor.h> -#include <asm/sh7722.h> +#include <cpu/sh7722.h> /* Address IRQ Size Bus Description * 0x00000000 64MB 16 NOR Flash (SP29PL256N) diff --git a/arch/sh/include/asm/sh7203.h b/arch/sh/include/cpu-sh2a/cpu/sh7203.h index 79f93159018..79f93159018 100644 --- a/arch/sh/include/asm/sh7203.h +++ b/arch/sh/include/cpu-sh2a/cpu/sh7203.h diff --git a/arch/sh/include/asm/sh7720.h b/arch/sh/include/cpu-sh3/cpu/sh7720.h index 41c1406d6da..41c1406d6da 100644 --- a/arch/sh/include/asm/sh7720.h +++ b/arch/sh/include/cpu-sh3/cpu/sh7720.h diff --git a/arch/sh/include/asm/sh7722.h b/arch/sh/include/cpu-sh4/sh7722.h index 4b3096f5307..4b3096f5307 100644 --- a/arch/sh/include/asm/sh7722.h +++ b/arch/sh/include/cpu-sh4/sh7722.h diff --git a/arch/sh/include/asm/sh7723.h b/arch/sh/include/cpu-sh4/sh7723.h index 9d2f6d7aa93..9d2f6d7aa93 100644 --- a/arch/sh/include/asm/sh7723.h +++ b/arch/sh/include/cpu-sh4/sh7723.h diff --git a/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c b/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c index b66c239509a..9ca15462714 100644 --- a/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c +++ b/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c @@ -11,7 +11,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> -#include <asm/sh7720.h> +#include <cpu/sh7720.h> enum { PINMUX_RESERVED = 0, diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c index 51b12ab58c9..cb9d07bd59f 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c @@ -1,7 +1,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> -#include <asm/sh7722.h> +#include <cpu/sh7722.h> enum { PINMUX_RESERVED = 0, diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c index 92a9bc91015..88bf5ecda84 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c @@ -11,7 +11,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> -#include <asm/sh7723.h> +#include <cpu/sh7723.h> enum { PINMUX_RESERVED = 0, |