diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /drivers/gpu/drm/drm_gem.c | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
| download | kernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.gz kernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.bz2 kernel_replicant_linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.zip | |
Merge branch 'linus' into next
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 74e4ff578017..4012fe423460 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -34,6 +34,7 @@ #include <linux/module.h> #include <linux/mman.h> #include <linux/pagemap.h> +#include <linux/shmem_fs.h> #include "drmP.h" /** @file drm_gem.c |