diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2010-07-18 21:51:42 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-20 15:24:06 +1000 |
| commit | 1e8655f87333def92bb8215b423adc65403b08a5 (patch) | |
| tree | c746916b7ef9c78b4cef92a7daac61e2c0af7b73 | |
| parent | 8d369bb196f1f9111cb7ab839d4f420378fa7b30 (diff) | |
| download | linux-stable-1e8655f87333def92bb8215b423adc65403b08a5.tar.gz linux-stable-1e8655f87333def92bb8215b423adc65403b08a5.tar.bz2 linux-stable-1e8655f87333def92bb8215b423adc65403b08a5.zip | |
drm/ttm: Fix build on architectures without AGP
Make inclusion of <asm/agp.h> conditional on TTM_HAS_AGP. The use
of the functions declared in it is already conditional.
Reported-by: Geert Stappers <stappers@stappers.nl>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Tested-by: Geert Stappers <stappers@stappers.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index b1d67dc973dc..1f32b460adce 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -40,7 +40,9 @@ #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" |