git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
sgivwfb.c
diff --git
a/drivers/video/sgivwfb.c
b/drivers/video/sgivwfb.c
index
2e6df1f
..
ebb6756
100644
(file)
--- a/
drivers/video/sgivwfb.c
+++ b/
drivers/video/sgivwfb.c
@@
-9,7
+9,6
@@
* more details.
*/
* more details.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@
-23,6
+22,8
@@
#include <asm/io.h>
#include <asm/mtrr.h>
#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>
#define INCLUDE_TIMING_TABLE_DATA
#define DBE_REG_BASE par->regs
#include <video/sgivw.h>
@@
-42,10
+43,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 ywrap = 0;
static int ypan = 0;
static int ywrap = 0;