Merge ../linux-2.6/

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

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 4f8043a71f21d1392438dade8c9ecafe0f7c0891..2d29db7ef800f195f8e583f456629da81d727c77 100644 (file)
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1307,7 +1307,7 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int sa1100fb_suspend(struct device *dev, u32 state, u32 level)
+static int sa1100fb_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        struct sa1100fb_info *fbi = dev_get_drvdata(dev);