[PATCH] fix sgivwfb compile
drivers/built-in.o: In function `sgivwfb_set_par': sgivwfb.c:(.text+0x88583): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x88596): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x885a8): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_check_var': sgivwfb.c:(.text+0x88ad0): undefined reference to `sgivwfb_mem_size' drivers/built-in.o: In function `sgivwfb_mmap': sgivwfb.c:(.text+0x88c75): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.text+0x88c7f): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_probe': sgivwfb.c:(.init.text+0x4060): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4065): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4076): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x409c): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x410e): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4113): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4162): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4168): undefined reference to `sgivwfb_mem_phys' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0a6047eef1
commit
0686cd8fbe
|
@ -140,8 +140,8 @@ void __init time_init_hook(void)
|
||||||
|
|
||||||
#define MB (1024 * 1024)
|
#define MB (1024 * 1024)
|
||||||
|
|
||||||
static unsigned long sgivwfb_mem_phys;
|
unsigned long sgivwfb_mem_phys;
|
||||||
static unsigned long sgivwfb_mem_size;
|
unsigned long sgivwfb_mem_size;
|
||||||
|
|
||||||
long long mem_size __initdata = 0;
|
long long mem_size __initdata = 0;
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,8 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/mtrr.h>
|
#include <asm/mtrr.h>
|
||||||
|
|
||||||
|
#include <setup_arch.h>
|
||||||
|
|
||||||
#define INCLUDE_TIMING_TABLE_DATA
|
#define INCLUDE_TIMING_TABLE_DATA
|
||||||
#define DBE_REG_BASE par->regs
|
#define DBE_REG_BASE par->regs
|
||||||
#include <video/sgivw.h>
|
#include <video/sgivw.h>
|
||||||
|
@ -42,10 +44,6 @@ struct sgivw_par {
|
||||||
* The default can be overridden if the driver is compiled as a module
|
* 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 ypan = 0;
|
||||||
static int ywrap = 0;
|
static int ywrap = 0;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
/* Hook to call BIOS initialisation function */
|
/* Hook to call BIOS initialisation function */
|
||||||
|
|
||||||
|
extern unsigned long sgivwfb_mem_phys;
|
||||||
|
extern unsigned long sgivwfb_mem_size;
|
||||||
|
|
||||||
/* no action for visws */
|
/* no action for visws */
|
||||||
|
|
||||||
#define ARCH_SETUP
|
#define ARCH_SETUP
|
||||||
|
|
Loading…
Reference in New Issue