[PATCH] sh: unknown mach-type updates

Trivial cleanup of the unknown machine type for some of the recent machvec
changes.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 9 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 0f1fbe72cce4..a067a34e0b64 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -186,7 +186,7 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
 
 static int __init sh_mv_setup(char **cmdline_p)
 {
-#if defined(CONFIG_SH_UNKNOWN)
+#ifdef CONFIG_SH_UNKNOWN
         extern struct sh_machine_vector mv_unknown;
 #endif
         struct sh_machine_vector *mv = NULL;
@@ -196,7 +196,7 @@ static int __init sh_mv_setup(char **cmdline_p)
 
         parse_cmdline(cmdline_p, mv_name, &mv, &mv_io_base, &mv_mmio_enable);
 
-#ifdef CONFIG_SH_GENERIC
+#ifdef CONFIG_SH_UNKNOWN
         if (mv == NULL) {
                 mv = &mv_unknown;
                 if (*mv_name != '\0') {
@@ -206,9 +206,6 @@ static int __init sh_mv_setup(char **cmdline_p)
         }
         sh_mv = *mv;
 #endif
-#ifdef CONFIG_SH_UNKNOWN
-        sh_mv = mv_unknown;
-#endif
 
         /*
          * Manually walk the vec, fill in anything that the board hasn't yet
@@ -231,10 +228,8 @@ static int __init sh_mv_setup(char **cmdline_p)
         mv_set(readb);  mv_set(readw);  mv_set(readl);
         mv_set(writeb); mv_set(writew); mv_set(writel);
 
-        mv_set(ioremap);
-        mv_set(iounmap);
-
-        mv_set(isa_port2addr);
+        mv_set(ioport_map);
+        mv_set(ioport_unmap);
         mv_set(irq_demux);
 
 #ifdef CONFIG_SH_UNKNOWN