diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /include/drm/drm_memory.h | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/drm/drm_memory.h')
| -rw-r--r-- | include/drm/drm_memory.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/drm_memory.h b/include/drm/drm_memory.h index 63e425b5ea82..15af9b32ae42 100644 --- a/include/drm/drm_memory.h +++ b/include/drm/drm_memory.h | |||
| @@ -44,8 +44,6 @@ | |||
| 44 | 44 | ||
| 45 | #if __OS_HAS_AGP | 45 | #if __OS_HAS_AGP |
| 46 | 46 | ||
| 47 | #include <linux/vmalloc.h> | ||
| 48 | |||
| 49 | #ifdef HAVE_PAGE_AGP | 47 | #ifdef HAVE_PAGE_AGP |
| 50 | #include <asm/agp.h> | 48 | #include <asm/agp.h> |
| 51 | #else | 49 | #else |