aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/mach-visws/setup.c4
-rw-r--r--drivers/video/sgivwfb.c6
-rw-r--r--include/asm-i386/mach-visws/setup_arch.h3
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/i386/mach-visws/setup.c b/arch/i386/mach-visws/setup.c
index 8a9e1a6f745d..11e83a0e1d62 100644
--- a/arch/i386/mach-visws/setup.c
+++ b/arch/i386/mach-visws/setup.c
@@ -140,8 +140,8 @@ void __init time_init_hook(void)
140 140
141#define MB (1024 * 1024) 141#define MB (1024 * 1024)
142 142
143static unsigned long sgivwfb_mem_phys; 143unsigned long sgivwfb_mem_phys;
144static unsigned long sgivwfb_mem_size; 144unsigned long sgivwfb_mem_size;
145 145
146long long mem_size __initdata = 0; 146long long mem_size __initdata = 0;
147 147
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 2e6df1fcb2b9..c0cc5e3ba7b5 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -23,6 +23,8 @@
23#include <asm/io.h> 23#include <asm/io.h>
24#include <asm/mtrr.h> 24#include <asm/mtrr.h>
25 25
26#include <setup_arch.h>
27
26#define INCLUDE_TIMING_TABLE_DATA 28#define INCLUDE_TIMING_TABLE_DATA
27#define DBE_REG_BASE par->regs 29#define DBE_REG_BASE par->regs
28#include <video/sgivw.h> 30#include <video/sgivw.h>
@@ -42,10 +44,6 @@ struct sgivw_par {
42 * The default can be overridden if the driver is compiled as a module 44 * The default can be overridden if the driver is compiled as a module
43 */ 45 */
44 46
45/* set by arch/i386/kernel/setup.c */
46extern unsigned long sgivwfb_mem_phys;
47extern unsigned long sgivwfb_mem_size;
48
49static int ypan = 0; 47static int ypan = 0;
50static int ywrap = 0; 48static int ywrap = 0;
51 49
diff --git a/include/asm-i386/mach-visws/setup_arch.h b/include/asm-i386/mach-visws/setup_arch.h
index b92d6d9a4d3c..33f700ef6831 100644
--- a/include/asm-i386/mach-visws/setup_arch.h
+++ b/include/asm-i386/mach-visws/setup_arch.h
@@ -1,5 +1,8 @@
1/* Hook to call BIOS initialisation function */ 1/* Hook to call BIOS initialisation function */
2 2
3extern unsigned long sgivwfb_mem_phys;
4extern unsigned long sgivwfb_mem_size;
5
3/* no action for visws */ 6/* no action for visws */
4 7
5#define ARCH_SETUP 8#define ARCH_SETUP