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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
video
/
hitfb.c
diff --git
a/drivers/video/hitfb.c
b/drivers/video/hitfb.c
index
9d2ea3b
..
f04ca72
100644
(file)
--- a/
drivers/video/hitfb.c
+++ b/
drivers/video/hitfb.c
@@
-1,6
+1,6
@@
/*
/*
- * $Id: hitfb.c,v 1.12 2004/03/16 00:07:51 lethal Exp $
* linux/drivers/video/hitfb.c -- Hitachi LCD frame buffer device
* linux/drivers/video/hitfb.c -- Hitachi LCD frame buffer device
+ *
* (C) 1999 Mihai Spatar
* (C) 2000 YAEGASHI Takeshi
* (C) 2003, 2004 Paul Mundt
* (C) 1999 Mihai Spatar
* (C) 2000 YAEGASHI Takeshi
* (C) 2003, 2004 Paul Mundt
@@
-40,15
+40,15
@@
static struct fb_var_screeninfo hitfb_var __initdata = {
.activate = FB_ACTIVATE_NOW,
.height = -1,
static struct fb_var_screeninfo hitfb_var __initdata = {
.activate = FB_ACTIVATE_NOW,
.height = -1,
- .width = -1,
- .vmode = FB_VMODE_NONINTERLACED,
+ .width = -1,
+ .vmode = FB_VMODE_NONINTERLACED,
};
static struct fb_fix_screeninfo hitfb_fix __initdata = {
};
static struct fb_fix_screeninfo hitfb_fix __initdata = {
- .id = "Hitachi HD64461",
- .type = FB_TYPE_PACKED_PIXELS,
- .ypanstep = 8,
- .accel = FB_ACCEL_NONE,
+ .id = "Hitachi HD64461",
+ .type = FB_TYPE_PACKED_PIXELS,
+ .ypanstep = 8,
+ .accel = FB_ACCEL_NONE,
};
static u32 pseudo_palette[16];
};
static u32 pseudo_palette[16];
@@
-255,14
+255,13
@@
static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green,
}
static struct fb_ops hitfb_ops = {
}
static struct fb_ops hitfb_ops = {
- .owner
= THIS_MODULE,
- .fb_setcolreg = hitfb_setcolreg,
- .fb_blank
= hitfb_blank,
+ .owner = THIS_MODULE,
+ .fb_setcolreg = hitfb_setcolreg,
+ .fb_blank = hitfb_blank,
.fb_pan_display = hitfb_pan_display,
.fb_pan_display = hitfb_pan_display,
- .fb_fillrect = hitfb_fillrect,
- .fb_copyarea = hitfb_copyarea,
- .fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor,
+ .fb_fillrect = hitfb_fillrect,
+ .fb_copyarea = hitfb_copyarea,
+ .fb_imageblit = cfb_imageblit,
};
int __init hitfb_init(void)
};
int __init hitfb_init(void)
@@
-324,7
+323,7
@@
int __init hitfb_init(void)
fb_info.var = hitfb_var;
fb_info.fix = hitfb_fix;
fb_info.pseudo_palette = pseudo_palette;
fb_info.var = hitfb_var;
fb_info.fix = hitfb_fix;
fb_info.pseudo_palette = pseudo_palette;
- fb_info.flags = FBINFO_DEFAULT
| FBINFO_HWACCEL_YPAN
;
+ fb_info.flags = FBINFO_DEFAULT;
fb_info.screen_base = (void *)hitfb_fix.smem_start;
fb_info.screen_base = (void *)hitfb_fix.smem_start;
@@
-345,9
+344,6
@@
static void __exit hitfb_exit(void)
}
module_init(hitfb_init);
}
module_init(hitfb_init);
-
-#ifdef MODULE
module_exit(hitfb_exit);
module_exit(hitfb_exit);
-#endif
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");