Merge ../linus

[linux-drm-fsl-dcu.git] / drivers / char / consolemap.c

diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index c85a4fa60da7e235b207a6ba84d305928ec1e142..04a12027a740a57dea956fd3abbba1785739500e 100644 (file)
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -11,7 +11,6 @@
  * Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kd.h>
 #include <linux/errno.h>