Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6] / arch / ppc / xmon / start.c

diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index d74a883e5bdeab5b82e1069e6cae3fe038c1472d..8f0b953179fa9deffd1a69b2aff079641ba6ab81 100644 (file)
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -58,10 +58,7 @@ static struct sysrq_key_op sysrq_xmon_op =
 void
 xmon_map_scc(void)
 {
-#if defined(CONFIG_GEMINI)
-       /* should already be mapped by the kernel boot */
-       sccd = (volatile unsigned char *) 0xffeffb08;
-#elif defined(CONFIG_405GP)
+#if defined(CONFIG_405GP)
        sccd = (volatile unsigned char *)0xef600300;
 #elif defined(CONFIG_440EP)
        sccd = (volatile unsigned char *) ioremap(PPC440EP_UART0_ADDR, 8);