Merge branch 'master' into 83xx

[linux-2.6] / drivers / char / drm / drm_pci.c

diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index b28ca9cea8a2a73c4f2c463fb762dc5fd94bae34..86a0f1c2209111075eb096d971271e08082f9e76 100644 (file)
--- 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"
 
 /**********************************************************************/