diff --git a/[refs] b/[refs]
index 34a55c0ce555..4eba7d41c5ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 681793711abca2b45f210a553962e2c4884b5587
+refs/heads/master: 8b6eb473c5f8f9906d8c514a8f352dac275b0f3e
diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
index f7f2eb0b7fea..1e74f0b97996 100644
--- a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
+++ b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
@@ -33,9 +33,7 @@
 #include <linux/proc_fs.h>
 #include <linux/uaccess.h>
 
-#include <asm/current.h>
-#include <asm/system.h>
-#include <asm/cplb.h>
+#include <asm/cplbinit.h>
 #include <asm/blackfin.h>
 
 #define CPLB_I 1
diff --git a/trunk/include/asm-blackfin/bfin-global.h b/trunk/include/asm-blackfin/bfin-global.h
index 08474eb28bb7..716df7c85923 100644
--- a/trunk/include/asm-blackfin/bfin-global.h
+++ b/trunk/include/asm-blackfin/bfin-global.h
@@ -112,15 +112,6 @@ extern void init_leds(void);
 
 extern const char bfin_board_name[];
 extern unsigned long wall_jiffies;
-extern unsigned long ipdt_table[];
-extern unsigned long dpdt_table[];
-extern unsigned long icplb_table[];
-extern unsigned long dcplb_table[];
-
-extern unsigned long ipdt_swapcount_table[];
-extern unsigned long dpdt_swapcount_table[];
-
-extern unsigned long table_start, table_end;
 
 extern unsigned long bfin_sic_iwr[];
 extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */