summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 10:49:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 10:49:11 -0700
commitac69e973ff0660e455f4ba1ddd4dcce4ae70ed1a (patch)
tree079826480a861b5d02e314248e51d69a9a7b8dfa /drivers/char/drm/drm_pci.c
parent102e41fd9dfee357b71e21a38eec3c86ff557bc1 (diff)
parentd253258c80117c2afaa644554e613201992e4ee9 (diff)
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: Fix further issues in drivers/char/drm/via_irq.c drivers/char/drm/drm_memory.c: possible cleanups drm: deline a few large inlines in DRM code drm: remove master setting from add/remove context drm: drm_pci needs dma-mapping.h [PATCH] drm: Fix issue reported by Coverity in drivers/char/drm/via_irq.c
Diffstat (limited to 'drivers/char/drm/drm_pci.c')
-rw-r--r--drivers/char/drm/drm_pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index b28ca9cea8a..86a0f1c2209 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -37,6 +37,7 @@
*/
#include <linux/pci.h>
+#include <linux/dma-mapping.h>
#include "drmP.h"
/**********************************************************************/