diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 16:04:11 +0400 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 16:04:11 +0400 |
| commit | afab4463acc5ae7aa975a0c2400b85ff541c6a5b (patch) | |
| tree | 9c0784a2fc475b2bdaf1c2d55e8401d70abe9bd8 /include/drm/drmP.h | |
| parent | a8469aa81de532180846b22e8ead3d8f4d2f96a2 (diff) | |
| parent | 44d847b7439bdea0b6c5640446427daa3ebcc7fa (diff) | |
| download | linux-afab4463acc5ae7aa975a0c2400b85ff541c6a5b.tar.xz | |
Merge branch 'drm-anon' into drm-next
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 04a7f31301f8..3227b716ffdf 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1183,7 +1183,7 @@ struct drm_device { struct drm_sg_mem *sg; /**< Scatter gather memory */ unsigned int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ - struct address_space *dev_mapping; + struct inode *anon_inode; struct drm_sigdata sigdata; /**< For block_all_signals */ sigset_t sigmask; |