Merge ../linux-2.6-watchdog-mm

[mv-sheeva.git] / drivers / char / drm / i830_drv.c

diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index 722658188f5f45619ec8515c6214979f458dde93..389597e4a623281b1c7db76766ddd9b52b15f791 100644 (file)
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -32,7 +32,6 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include <linux/config.h>
 #include "drmP.h"
 #include "drm.h"
 #include "i830_drm.h"