diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-06-27 15:17:12 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-06-27 15:17:12 +0000 |
| commit | e2d76b0642d88c4f47ace52ee5eb3163c4e478d5 (patch) | |
| tree | 9dccb1e1d7b19560572d41f7dfff54ab43eb67d6 /linux-core | |
| parent | 1a6780348c9e61833ca240ce6fb80aaa6e75fb92 (diff) | |
Reverse the pm_message_t patch for now, it appears that the 2.6.12 release
didn't have it.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_pm.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/linux-core/drm_pm.c b/linux-core/drm_pm.c index 844266ac..1e93e1da 100644 --- a/linux-core/drm_pm.c +++ b/linux-core/drm_pm.c @@ -36,24 +36,15 @@ #include <linux/sysdev.h> -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11) static int drm_suspend(struct sys_device *sysdev, u32 state) -#else -static int drm_suspend(struct sys_device *sysdev, pm_message_t state) -#endif { struct drm_device *dev = container_of(sysdev, struct drm_device, sysdev); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - int event = state.event; -#else - int event = state; -#endif - DRM_DEBUG("event=%d\n", event); + DRM_DEBUG("state=%d\n", state); if (dev->driver->power) - return dev->driver->power(dev, event); + return dev->driver->power(dev, state); else return 0; } |