From 82478c4417cafd4ec70c8a395d7b940a406e591c Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 29 Jun 2006 02:24:25 -0700
Subject: [PATCH] --- yaml --- r: 31038 b: refs/heads/master c:
 0686cd8fbe3e5fb1441ae84b9cbc813f9297b879 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/i386/mach-visws/setup.c             | 4 ++--
 trunk/drivers/video/sgivwfb.c                  | 6 ++----
 trunk/include/asm-i386/mach-visws/setup_arch.h | 3 +++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 284fe3f7da7e..fcfa2c738a04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a6047eef1c465c38aacfbdab193161b3f0cd144
+refs/heads/master: 0686cd8fbe3e5fb1441ae84b9cbc813f9297b879
diff --git a/trunk/arch/i386/mach-visws/setup.c b/trunk/arch/i386/mach-visws/setup.c
index 8a9e1a6f745d..11e83a0e1d62 100644
--- a/trunk/arch/i386/mach-visws/setup.c
+++ b/trunk/arch/i386/mach-visws/setup.c
@@ -140,8 +140,8 @@ void __init time_init_hook(void)
 
 #define MB (1024 * 1024)
 
-static unsigned long sgivwfb_mem_phys;
-static unsigned long sgivwfb_mem_size;
+unsigned long sgivwfb_mem_phys;
+unsigned long sgivwfb_mem_size;
 
 long long mem_size __initdata = 0;
 
diff --git a/trunk/drivers/video/sgivwfb.c b/trunk/drivers/video/sgivwfb.c
index 2e6df1fcb2b9..c0cc5e3ba7b5 100644
--- a/trunk/drivers/video/sgivwfb.c
+++ b/trunk/drivers/video/sgivwfb.c
@@ -23,6 +23,8 @@
 #include <asm/io.h>
 #include <asm/mtrr.h>
 
+#include <setup_arch.h>
+
 #define INCLUDE_TIMING_TABLE_DATA
 #define DBE_REG_BASE par->regs
 #include <video/sgivw.h>
@@ -42,10 +44,6 @@ struct sgivw_par {
  *  The default can be overridden if the driver is compiled as a module
  */
 
-/* set by arch/i386/kernel/setup.c */
-extern unsigned long sgivwfb_mem_phys;
-extern unsigned long sgivwfb_mem_size;
-
 static int ypan = 0;
 static int ywrap = 0;
 
diff --git a/trunk/include/asm-i386/mach-visws/setup_arch.h b/trunk/include/asm-i386/mach-visws/setup_arch.h
index b92d6d9a4d3c..33f700ef6831 100644
--- a/trunk/include/asm-i386/mach-visws/setup_arch.h
+++ b/trunk/include/asm-i386/mach-visws/setup_arch.h
@@ -1,5 +1,8 @@
 /* Hook to call BIOS initialisation function */
 
+extern unsigned long sgivwfb_mem_phys;
+extern unsigned long sgivwfb_mem_size;
+
 /* no action for visws */
 
 #define ARCH_SETUP