projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
video
/
sgivwfb.c
diff --git
a/drivers/video/sgivwfb.c
b/drivers/video/sgivwfb.c
index
2e6df1f
..
f5252c2
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>
@@
-22,6
+21,7
@@
#include <asm/io.h>
#include <asm/mtrr.h>
#include <asm/io.h>
#include <asm/mtrr.h>
+#include <asm/visws/sgivw.h>
#define INCLUDE_TIMING_TABLE_DATA
#define DBE_REG_BASE par->regs
#define INCLUDE_TIMING_TABLE_DATA
#define DBE_REG_BASE par->regs
@@
-42,10
+42,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;
@@
-755,7
+751,7
@@
static int __init sgivwfb_probe(struct platform_device *dev)
struct fb_info *info;
char *monitor;
struct fb_info *info;
char *monitor;
- info = framebuffer_alloc(sizeof(struct sgivw_par) + sizeof(u32) *
25
6, &dev->dev);
+ info = framebuffer_alloc(sizeof(struct sgivw_par) + sizeof(u32) *
1
6, &dev->dev);
if (!info)
return -ENOMEM;
par = info->par;
if (!info)
return -ENOMEM;
par = info->par;