diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-22 11:45:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-22 11:45:57 -0700 |
| commit | 84d4db0e22965334ae8272f324d31fb4657465aa (patch) | |
| tree | b20a90bc599a275c898b87aa855904e93090d863 /drivers/gpu/drm/ttm | |
| parent | 38ea6e62d3e59f7e03c6c96301d1cedaab15ce3f (diff) | |
| parent | 52fa2bbc8ec46255039e2048d616bbd0852ee292 (diff) | |
| download | linux-84d4db0e22965334ae8272f324d31fb4657465aa.tar.gz linux-84d4db0e22965334ae8272f324d31fb4657465aa.tar.bz2 linux-84d4db0e22965334ae8272f324d31fb4657465aa.zip | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: add quirk to make HP DV5000 laptop resume
drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
Fix ttm_page_alloc.c build breakage
drm/radeon/kms: fix legacy LVDS dpms sequence
drm/radeon/kms: drop taking lock around crtc lookup.
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index d233c65f3f7f..ca904799f018 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -40,13 +40,13 @@ #include <linux/slab.h> #include <asm/atomic.h> -#ifdef TTM_HAS_AGP -#include <asm/agp.h> -#endif #include "ttm/ttm_bo_driver.h" #include "ttm/ttm_page_alloc.h" +#ifdef TTM_HAS_AGP +#include <asm/agp.h> +#endif #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *)) #define SMALL_ALLOCATION 16 |