diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-21 11:37:07 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-21 11:37:07 +0000 |
| commit | ea3de6daa4226cdcc4b50c339e0df6130014d2fe (patch) | |
| tree | 097d8da67aff49eae70dd86359621e1901c9bc5b /linux-core/drm_sysfs.c | |
| parent | 3f6c8f64aa8c3a9e427d453433e828693fb4e017 (diff) | |
| parent | 374b41e5bcdb5c22471c8c16dd794ac54c4f76d2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_sysfs.c
Diffstat (limited to 'linux-core/drm_sysfs.c')
| -rw-r--r-- | linux-core/drm_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c index f03e5d4e..3372a713 100644 --- a/linux-core/drm_sysfs.c +++ b/linux-core/drm_sysfs.c @@ -38,7 +38,7 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) if (drm_minor->type == DRM_MINOR_CONTROL) if (drm_dev->driver->suspend) - return drm_dev->driver->suspend(drm_dev); + return drm_dev->driver->suspend(drm_dev, state); return 0; } |