sh: mach-x3proto: Move the ilsel header to a better place.

We'll be adding more headers for this board, so move this over to its own
directory.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/mach-x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
index 5c9842704c60f39cc1039f8c5cc8180ad67f91fb..aa8eb7e542805cffd39b1e75e03327ba20ca141e 100644 (file)
--- a/arch/sh/boards/mach-x3proto/ilsel.c
+++ b/arch/sh/boards/mach-x3proto/ilsel.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/bitmap.h>
 #include <linux/io.h>
-#include <asm/ilsel.h>
+#include <mach/ilsel.h>
 
 /*
  * ILSEL is split across:

diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index 21f1bb67248e10b28f974c0f1334089cc355f89d..8fd75109bdc6d32e8d998069ddcef30eb26033cb 100644 (file)
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -18,7 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/m66592.h>
-#include <asm/ilsel.h>
+#include <mach/ilsel.h>
 #include <asm/smp-ops.h>
 
 static struct resource heartbeat_resources[] = {

diff --git a/arch/sh/include/asm/ilsel.h b/arch/sh/include/asm/ilsel.h
deleted file mode 100644 (file)
index e3d304b..0000000
--- a/arch/sh/include/asm/ilsel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __ASM_SH_ILSEL_H
-#define __ASM_SH_ILSEL_H
-
-typedef enum {
-       ILSEL_NONE,
-       ILSEL_LAN,
-       ILSEL_USBH_I,
-       ILSEL_USBH_S,
-       ILSEL_USBH_V,
-       ILSEL_RTC,
-       ILSEL_USBP_I,
-       ILSEL_USBP_S,
-       ILSEL_USBP_V,
-       ILSEL_KEY,
-
-       /*
-        * ILSEL Aliases - corner cases for interleaved level tables.
-        *
-        * Someone thought this was a good idea and less hassle than
-        * demuxing a shared vector, really.
-        */
-
-       /* ILSEL0 and 2 */
-       ILSEL_FPGA0,
-       ILSEL_FPGA1,
-       ILSEL_EX1,
-       ILSEL_EX2,
-       ILSEL_EX3,
-       ILSEL_EX4,
-
-       /* ILSEL1 and 3 */
-       ILSEL_FPGA2 = ILSEL_FPGA0,
-       ILSEL_FPGA3 = ILSEL_FPGA1,
-       ILSEL_EX5 = ILSEL_EX1,
-       ILSEL_EX6 = ILSEL_EX2,
-       ILSEL_EX7 = ILSEL_EX3,
-       ILSEL_EX8 = ILSEL_EX4,
-} ilsel_source_t;
-
-/* arch/sh/boards/renesas/x3proto/ilsel.c */
-int ilsel_enable(ilsel_source_t set);
-int ilsel_enable_fixed(ilsel_source_t set, unsigned int level);
-void ilsel_disable(unsigned int irq);
-
-#endif /* __ASM_SH_ILSEL_H */

diff --git a/arch/sh/include/mach-x3proto/mach/ilsel.h b/arch/sh/include/mach-x3proto/mach/ilsel.h
new file mode 100644 (file)
index 0000000..e3d304b
--- /dev/null
+++ b/arch/sh/include/mach-x3proto/mach/ilsel.h
@@ -0,0 +1,45 @@
+#ifndef __ASM_SH_ILSEL_H
+#define __ASM_SH_ILSEL_H
+
+typedef enum {
+       ILSEL_NONE,
+       ILSEL_LAN,
+       ILSEL_USBH_I,
+       ILSEL_USBH_S,
+       ILSEL_USBH_V,
+       ILSEL_RTC,
+       ILSEL_USBP_I,
+       ILSEL_USBP_S,
+       ILSEL_USBP_V,
+       ILSEL_KEY,
+
+       /*
+        * ILSEL Aliases - corner cases for interleaved level tables.
+        *
+        * Someone thought this was a good idea and less hassle than
+        * demuxing a shared vector, really.
+        */
+
+       /* ILSEL0 and 2 */
+       ILSEL_FPGA0,
+       ILSEL_FPGA1,
+       ILSEL_EX1,
+       ILSEL_EX2,
+       ILSEL_EX3,
+       ILSEL_EX4,
+
+       /* ILSEL1 and 3 */
+       ILSEL_FPGA2 = ILSEL_FPGA0,
+       ILSEL_FPGA3 = ILSEL_FPGA1,
+       ILSEL_EX5 = ILSEL_EX1,
+       ILSEL_EX6 = ILSEL_EX2,
+       ILSEL_EX7 = ILSEL_EX3,
+       ILSEL_EX8 = ILSEL_EX4,
+} ilsel_source_t;
+
+/* arch/sh/boards/renesas/x3proto/ilsel.c */
+int ilsel_enable(ilsel_source_t set);
+int ilsel_enable_fixed(ilsel_source_t set, unsigned int level);
+void ilsel_disable(unsigned int irq);
+
+#endif /* __ASM_SH_ILSEL_H */