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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
video
/
sa1100fb.c
diff --git
a/drivers/video/sa1100fb.c
b/drivers/video/sa1100fb.c
index
b14a667
..
ae8fb7a
100644
(file)
--- a/
drivers/video/sa1100fb.c
+++ b/
drivers/video/sa1100fb.c
@@
-328,17
+328,17
@@
static struct sa1100fb_mach_info brutus_info __initdata = {
#ifdef CONFIG_SA1100_COLLIE
static struct sa1100fb_mach_info collie_info __initdata = {
#ifdef CONFIG_SA1100_COLLIE
static struct sa1100fb_mach_info collie_info __initdata = {
-
pixclock: 171521, bpp:
16,
-
xres: 320, yres:
240,
+
.pixclock = 171521, .bpp =
16,
+
.xres = 320, .yres =
240,
-
hsync_len: 5, vsync_len:
1,
-
left_margin: 11, upper_margin:
2,
-
right_margin: 30, lower_margin:
0,
+
.hsync_len = 5, .vsync_len =
1,
+
.left_margin = 11, .upper_margin =
2,
+
.right_margin = 30, .lower_margin =
0,
-
sync:
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+
.sync =
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-
lccr0:
LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
-
lccr3:
LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
+
.lccr0 =
LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
+
.lccr3 =
LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
};
#endif
};
#endif
@@
-1074,7
+1074,7
@@
static int sa1100fb_blank(int blank, struct fb_info *info)
case VESA_NO_BLANKING:
if (fbi->fb.fix.visual == FB_VISUAL_PSEUDOCOLOR ||
fbi->fb.fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR)
case VESA_NO_BLANKING:
if (fbi->fb.fix.visual == FB_VISUAL_PSEUDOCOLOR ||
fbi->fb.fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR)
- fb_set_cmap(&fbi->fb.cmap,
1,
info);
+ fb_set_cmap(&fbi->fb.cmap, info);
sa1100fb_schedule_work(fbi, C_ENABLE);
}
return 0;
sa1100fb_schedule_work(fbi, C_ENABLE);
}
return 0;
@@
-1291,8
+1291,7
@@
static void sa1100fb_enable_controller(struct sa1100fb_info *fbi)
#error Where is GPIO24 set as an output? Can we fit this in somewhere else?
if (machine_is_graphicsclient()) {
// From ADS doc again...same as disable
#error Where is GPIO24 set as an output? Can we fit this in somewhere else?
if (machine_is_graphicsclient()) {
// From ADS doc again...same as disable
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(20 * HZ / 1000);
+ msleep(20);
GPSR |= GPIO_GPIO24;
}
#endif
GPSR |= GPIO_GPIO24;
}
#endif
@@
-1327,8
+1326,7
@@
static void sa1100fb_disable_controller(struct sa1100fb_info *fbi)
* We'll wait 20msec.
*/
GPCR |= GPIO_GPIO24;
* We'll wait 20msec.
*/
GPCR |= GPIO_GPIO24;
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(20 * HZ / 1000);
+ msleep(20);
}
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL
}
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL