diff --git a/cpu/74xx_7xx/traps.c b/cpu/74xx_7xx/traps.c
index b06622769699e66fdc45b36639fb4d9bd9424863..24e28e212a4401952a48b5ac0b50f8bd9a70eadf 100644
--- a/cpu/74xx_7xx/traps.c
+++ b/cpu/74xx_7xx/traps.c
@@ -40,10 +40,6 @@
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
 
diff --git a/cpu/mpc5xx/traps.c b/cpu/mpc5xx/traps.c
index 78c820ae7e3f2d7eba4a5cf8e961a56a42039e45..cc8e091352836ab74276f45802cfe503e63da756 100644
--- a/cpu/mpc5xx/traps.c
+++ b/cpu/mpc5xx/traps.c
@@ -36,10 +36,6 @@
 #include <command.h>
 #include <asm/processor.h>
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 #if defined(CONFIG_CMD_BEDBUG)
 extern void do_bedbug_breakpoint(struct pt_regs *);
 #endif
diff --git a/cpu/mpc5xxx/traps.c b/cpu/mpc5xxx/traps.c
index daa1ec6b58910674408fdc437768bbba38da2d51..2a0915351e7a788b35b0198520bacdda84c6d6e1 100644
--- a/cpu/mpc5xxx/traps.c
+++ b/cpu/mpc5xxx/traps.c
@@ -37,10 +37,6 @@
 #include <command.h>
 #include <asm/processor.h>
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
 
diff --git a/cpu/mpc8220/traps.c b/cpu/mpc8220/traps.c
index 89cca1d2237a5e6fd36075b88b720eab5f69e16d..f98d40f008742bdbbd8352b8cb04e454613131e8 100644
--- a/cpu/mpc8220/traps.c
+++ b/cpu/mpc8220/traps.c
@@ -37,10 +37,6 @@
 #include <command.h>
 #include <asm/processor.h>
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler) (struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table (unsigned long);
 
diff --git a/cpu/mpc8260/traps.c b/cpu/mpc8260/traps.c
index 6624544eac09392b15ff2d921d58457267c52121..f9f4dea9392da1fcfa927a410b2d8506b2462734 100644
--- a/cpu/mpc8260/traps.c
+++ b/cpu/mpc8260/traps.c
@@ -37,10 +37,6 @@
 #include <asm/processor.h>
 #include <asm/m8260_pci.h>
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
 
diff --git a/cpu/mpc85xx/traps.c b/cpu/mpc85xx/traps.c
index 9d16b9b55e7b058bd244791c06d1fc509da25a77..241ebd5657c7b852b21e12131935a995615d7093 100644
--- a/cpu/mpc85xx/traps.c
+++ b/cpu/mpc85xx/traps.c
@@ -42,10 +42,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
 
diff --git a/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c
index 13f386ddc847e7145957d0ba73f142f4bb99cbdf..ad005c3afe663972205a95856f23651da0c8cb54 100644
--- a/cpu/mpc86xx/traps.c
+++ b/cpu/mpc86xx/traps.c
@@ -36,10 +36,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
 
diff --git a/cpu/mpc8xx/traps.c b/cpu/mpc8xx/traps.c
index e1ec88961ab61bafda75a75fcc1aedc2888eaa42..f357c8d6bfbe66e0ad0189f5cce65cff149f2401 100644
--- a/cpu/mpc8xx/traps.c
+++ b/cpu/mpc8xx/traps.c
@@ -36,10 +36,6 @@
 #include <command.h>
 #include <asm/processor.h>
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 #if defined(CONFIG_CMD_BEDBUG)
 extern void do_bedbug_breakpoint(struct pt_regs *);
 #endif
diff --git a/cpu/ppc4xx/traps.c b/cpu/ppc4xx/traps.c
index 55154b6f0110c262fb264a4e2bcfda7387f0174e..cb35faf081414d30526c74b3458ba0c93abda684 100644
--- a/cpu/ppc4xx/traps.c
+++ b/cpu/ppc4xx/traps.c
@@ -38,10 +38,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_KGDB)
-int (*debugger_exception_handler)(struct pt_regs *) = 0;
-#endif
-
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);