diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
commit | 7903aad4738b38f48fb8800782b186be8dfaa024 (patch) | |
tree | a8b20157c57c9dc35f049725d38fb2ca645c816a /drivers/mfd/glamo/glamo-cmdq.h | |
parent | d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee (diff) | |
parent | 5b85050a8f1e7db530f803627ba6371ca9c0ba9b (diff) |
Merge branch 'drm-kms' into drm-tracking
Conflicts:
drivers/mfd/glamo/glamo-cmdq.c
drivers/mfd/glamo/glamo-cmdq.h
drivers/mfd/glamo/glamo-drm-drv.c
drivers/mfd/glamo/glamo-drm-private.h
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/glamo-cmdq.h')
-rw-r--r-- | drivers/mfd/glamo/glamo-cmdq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h index e72fea9bec5..35c8bea1dcb 100644 --- a/drivers/mfd/glamo/glamo-cmdq.h +++ b/drivers/mfd/glamo/glamo-cmdq.h @@ -36,6 +36,7 @@ extern int glamo_ioctl_cmdbuf(struct drm_device *dev, void *data, extern int glamo_cmdq_init(struct glamodrm_handle *gdrm); extern int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm); - +extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm); +extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm); #endif /* __GLAMO_CMDQ_H */ |