Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

1 files changed, 0 insertions, 14 deletions

diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index fd9604d5555a..3de30f79db3f 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -59,10 +59,6 @@ int cfe_cons_handle;
 extern unsigned long initrd_start, initrd_end;
 #endif
 
-#ifdef CONFIG_KGDB
-extern int kgdb_port;
-#endif
-
 static void __noreturn cfe_linux_exit(void *arg)
 {
         int warm = *(int *)arg;
@@ -246,9 +242,6 @@ void __init prom_init(void)
         int argc = fw_arg0;
         char **envp = (char **) fw_arg2;
         int *prom_vec = (int *) fw_arg3;
-#ifdef CONFIG_KGDB
-        char *arg;
-#endif
 
         _machine_restart   = cfe_linux_restart;
         _machine_halt      = cfe_linux_halt;
@@ -309,13 +302,6 @@ void __init prom_init(void)
                 }
         }
 
-#ifdef CONFIG_KGDB
-        if ((arg = strstr(arcs_cmdline, "kgdb=duart")) != NULL)
-                kgdb_port = (arg[10] == '0') ? 0 : 1;
-        else
-                kgdb_port = 1;
-#endif
-
 #ifdef CONFIG_BLK_DEV_INITRD
         {
                 char *ptr;