Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894673ee authored by Jon Smirl's avatar Jon Smirl Committed by Linus Torvalds
Browse files

[PATCH] tty: Remove include of screen_info.h from tty.h 



screen_info.h doesn't have anything to do with the tty layer and shouldn't be
included by tty.h.  This patches removes the include and modifies all users to
directly include screen_info.h.  struct screen_info is mainly used to
communicate with the console drivers in drivers/video/console.  Note that this
patch touches every arch and I have no way of testing it.  If there is a
mistake the worst thing that will happen is a compile error.

[akpm@osdl.org: fix arm build]
[akpm@osdl.org: fix alpha build]
Signed-off-by: default avatarJon Smirl <jonsmir@gmail.com>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a8f340e3

arch/alpha/kernel/alpha_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/in.h>

#include <linux/in6.h>

#include <linux/pci.h>

#include <linux/screen_info.h>

#include <linux/tty.h>

#include <linux/mm.h>

#include <linux/delay.h>

arch/alpha/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/slab.h>

#include <linux/user.h>

#include <linux/a.out.h>

#include <linux/tty.h>

#include <linux/screen_info.h>

#include <linux/delay.h>

#include <linux/config.h>	/* CONFIG_ALPHA_LCA etc */

#include <linux/mc146818rtc.h>

arch/alpha/kernel/sys_sio.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/sched.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/tty.h>

#include <linux/screen_info.h>



#include <asm/compiler.h>

#include <asm/ptrace.h>

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/console.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/tty.h>

#include <linux/screen_info.h>

#include <linux/init.h>

#include <linux/root_dev.h>

#include <linux/cpu.h>

arch/arm26/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/console.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/tty.h>

#include <linux/screen_info.h>

#include <linux/init.h>

#include <linux/root_dev.h>