diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/video/s1d13xxxfb.c | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/s1d13xxxfb.c')
| -rw-r--r-- | drivers/video/s1d13xxxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 3848be2b9d2d..fa98d91c42eb 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
| @@ -655,7 +655,7 @@ bail: | |||
| 655 | } | 655 | } |
| 656 | 656 | ||
| 657 | #ifdef CONFIG_PM | 657 | #ifdef CONFIG_PM |
| 658 | static int s1d13xxxfb_suspend(struct device *dev, u32 state, u32 level) | 658 | static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level) |
| 659 | { | 659 | { |
| 660 | struct fb_info *info = dev_get_drvdata(dev); | 660 | struct fb_info *info = dev_get_drvdata(dev); |
| 661 | struct s1d13xxxfb_par *s1dfb = info->par; | 661 | struct s1d13xxxfb_par *s1dfb = info->par; |