Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[firefly-linux-kernel-4.4.55.git] / drivers / video / console / promcon.c

diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index d6e6ad537f9f73e8a05c5a5ff698bc08f0547161..b78eac63459f09d18c928f88f33f6b86cc8155aa 100644 (file)
--- a/drivers/video/console/promcon.c
+++ b/drivers/video/console/promcon.c
@@ -5,13 +5,11 @@
  * Copyright (C) 1998  Jakub Jelinek  (jj@ultra.linux.cz)
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/console.h>