From e2d76b0642d88c4f47ace52ee5eb3163c4e478d5 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Mon, 27 Jun 2005 15:17:12 +0000 Subject: Reverse the pm_message_t patch for now, it appears that the 2.6.12 release didn't have it. --- linux-core/drm_pm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'linux-core') 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 -#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; } -- cgit v1.2.3