This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / sa1100fb.c

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index ae8fb7a..b14a667 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 = {
-       .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
 
@@ -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)
-                       fb_set_cmap(&fbi->fb.cmap, info);
+                       fb_set_cmap(&fbi->fb.cmap, 1, info);
                sa1100fb_schedule_work(fbi, C_ENABLE);
        }
        return 0;
@@ -1291,7 +1291,8 @@ 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
-               msleep(20);
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(20 * HZ / 1000);
                GPSR |= GPIO_GPIO24;
        }
 #endif
@@ -1326,7 +1327,8 @@ static void sa1100fb_disable_controller(struct sa1100fb_info *fbi)
                 * We'll wait 20msec.
                 */
                GPCR |= GPIO_GPIO24;
-               msleep(20);
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(20 * HZ / 1000);
        }
 #endif
 #ifdef CONFIG_SA1100_HUW_WEBPANEL