diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /include/drm/drm_memory.h | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 |