Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / drivers / char / drm / ffb_drv.c

diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
index c13f9abb41e9b2f3ad88a8303e525ebf874b35d5..dd45111a48547619063d30dfdadd2eb2c78a81ba 100644 (file)
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
@@ -4,7 +4,6 @@
  * Copyright (C) 2000 David S. Miller (davem@redhat.com)
  */
 
-#include <linux/config.h>
 #include "ffb.h"
 #include "drmP.h"