diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/gpu/drm/drm_vm.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_vm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 4ac900f4647f..c3b13fb41d0c 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "drmP.h" | 36 | #include "drmP.h" |
| 37 | #if defined(__ia64__) | 37 | #if defined(__ia64__) |
| 38 | #include <linux/efi.h> | 38 | #include <linux/efi.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #endif | 40 | #endif |
| 40 | 41 | ||
| 41 | static void drm_vm_open(struct vm_area_struct *vma); | 42 | static void drm_vm_open(struct vm_area_struct *vma); |