Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[mv-sheeva.git] / drivers / video / controlfb.c

diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 655301a8671c139f4ead17f56b05ad89a3a26d03..acdd6a103dbb49d97c881274c0314e691382f1e0 100644 (file)
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -31,7 +31,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>