aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-02-12 00:55:01 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:48:42 -0800
commitf9506a53b446bc942c79584d3ce442d6334de697 (patch)
tree43b9f4d82e31ec2af75fa79bb2201de1e48648f5
parent[PATCH] cyber2010 framebuffer on ARM Netwinder fix (diff)
downloadlinux-dev-f9506a53b446bc942c79584d3ce442d6334de697.tar.xz
linux-dev-f9506a53b446bc942c79584d3ce442d6334de697.zip
[PATCH] proper prototype for tosh_smm()
Add a proper prototype for tosh_smm() to include/linux/toshiba.h Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: James Simmons <jsimmons@infradead.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/neofb.c1
-rw-r--r--include/linux/toshiba.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index deaf820cb38f..459ca553ffc0 100644
--- a/drivers/video/neofb.c
+++ b/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/include/linux/toshiba.h b/include/linux/toshiba.h
index 916e5e3a699b..6a7c4edf0e13 100644
--- a/include/linux/toshiba.h
+++ b/include/linux/toshiba.h
@@ -33,4 +33,6 @@ typedef struct {
unsigned int edi __attribute__ ((packed));
} SMMRegisters;
+int tosh_smm(SMMRegisters *regs);
+
#endif