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/drmP.h | |
| 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/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 297d8d60..0f42d5b6 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -647,7 +647,7 @@ struct drm_driver { void (*postclose) (struct drm_device *, struct drm_file *); void (*lastclose) (struct drm_device *); int (*unload) (struct drm_device *); - int (*suspend) (struct drm_device *); + int (*suspend) (struct drm_device *, pm_message_t state); int (*resume) (struct drm_device *); int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); void (*dma_ready) (struct drm_device *); |