diff --git a/[refs] b/[refs]
index 1c6adb3855cd..e26c28fd0304 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd792aa896f281a224870eb5f2ee5b24682910a5
+refs/heads/master: f9506a53b446bc942c79584d3ce442d6334de697
diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c
index deaf820cb38f..459ca553ffc0 100644
--- a/trunk/drivers/video/neofb.c
+++ b/trunk/drivers/video/neofb.c
@@ -66,7 +66,6 @@
 #include <linux/init.h>
 #ifdef CONFIG_TOSHIBA
 #include <linux/toshiba.h>
-extern int tosh_smm(SMMRegisters *regs);
 #endif
 
 #include <asm/io.h>
diff --git a/trunk/include/linux/toshiba.h b/trunk/include/linux/toshiba.h
index 916e5e3a699b..6a7c4edf0e13 100644
--- a/trunk/include/linux/toshiba.h
+++ b/trunk/include/linux/toshiba.h
@@ -33,4 +33,6 @@ typedef struct {
 	unsigned int edi __attribute__ ((packed));
 } SMMRegisters;
 
+int tosh_smm(SMMRegisters *regs);
+
 #endif