aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-12-11 16:58:00 +1000
committerDave Airlie <airlied@linux.ie>2007-12-11 16:58:00 +1000
commit8d2da202337300e821f4867cb2654b41ff6053b6 (patch)
treec7b0c4644c99180081eaa3f2e4bf0d1b4f8bbd63 /linux-core/drmP.h
parentf99dea7db00dd46aa96eaed3a61dff9c956fd86f (diff)
parentcfa21b22b43c7113107b5eb086b5f4d4ec36dc0a (diff)
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts: linux-core/drm_drv.c shared-core/drm.h shared-core/i915_dma.c
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index afdf6798..4a0cabc3 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -66,8 +66,8 @@
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
#endif
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
#include <asm/agp.h>
+#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
#include <linux/types.h>
#include <linux/agp_backend.h>
#endif