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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
video
/
epson1355fb.c
diff --git
a/drivers/video/epson1355fb.c
b/drivers/video/epson1355fb.c
index
116e808
..
6cb54f8
100644
(file)
--- a/
drivers/video/epson1355fb.c
+++ b/
drivers/video/epson1355fb.c
@@
-288,25
+288,22
@@
static int epson1355fb_blank(int blank_mode, struct fb_info *info)
struct epson1355_par *par = info->par;
switch (blank_mode) {
struct epson1355_par *par = info->par;
switch (blank_mode) {
- case FB_BLANK_UNBLANKING:
- case FB_BLANK_NORMAL:
+ case VESA_NO_BLANKING:
lcd_enable(par, 1);
backlight_enable(1);
break;
lcd_enable(par, 1);
backlight_enable(1);
break;
- case
FB_BLANK
_VSYNC_SUSPEND:
- case
FB_BLANK
_HSYNC_SUSPEND:
+ case
VESA
_VSYNC_SUSPEND:
+ case
VESA
_HSYNC_SUSPEND:
backlight_enable(0);
break;
backlight_enable(0);
break;
- case
FB_BLANK
_POWERDOWN:
+ case
VESA
_POWERDOWN:
backlight_enable(0);
lcd_enable(par, 0);
break;
default:
return -EINVAL;
}
backlight_enable(0);
lcd_enable(par, 0);
break;
default:
return -EINVAL;
}
-
- /* let fbcon do a soft blank for us */
- return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;
+ return 0;
}
/* ------------------------------------------------------------------------- */
}
/* ------------------------------------------------------------------------- */