vserver 2.0 rc7

[linux-2.6.git] / drivers / video / backlight / corgi_bl.c

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index b54ec44..353cb3f 100644 (file)
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -52,9 +52,9 @@ static void corgibl_send_intensity(int intensity)
        corgi_ssp_blduty_set(intensity & 0x1f);
        /* Bit 5 is via SCOOP */
        if (intensity & 0x0020)
-               set_scoop_gpio(CORGI_SCP_BACKLIGHT_CONT);
+               set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT);
        else
-               reset_scoop_gpio(CORGI_SCP_BACKLIGHT_CONT);
+               reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_BACKLIGHT_CONT);
        spin_unlock_irqrestore(&bl_lock, flags);
 }
 
@@ -81,7 +81,7 @@ static void corgibl_blank(int blank)
 }
 
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct device *dev, u32 state, u32 level)
+static int corgibl_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        if (level == SUSPEND_POWER_DOWN)
                corgibl_blank(FB_BLANK_POWERDOWN);