um: take chan_*.h and line.h to arch/um/drivers

Signed-off-by: Al Viro <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
vieko · Nov 2, 2011 · 510c72a · 510c72a
1 parent 17e0520
commit 510c72a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/arch/um/include/shared/chan_kern.h → arch/um/drivers/chan.h b/arch/um/include/shared/chan_kern.h → arch/um/drivers/chan.h
@@ -6,9 +6,9 @@
 #ifndef __CHAN_KERN_H__
 #define __CHAN_KERN_H__
 
-#include "linux/tty.h"
-#include "linux/list.h"
-#include "linux/console.h"
+#include <linux/tty.h>
+#include <linux/list.h>
+#include <linux/console.h>
 #include "chan_user.h"
 #include "line.h"
 

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
@@ -6,7 +6,7 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include "chan_kern.h"
+#include "chan.h"
 #include "os.h"
 
 #ifdef CONFIG_NOCONFIG_CHAN

diff --git a/arch/um/include/shared/chan_user.h → arch/um/drivers/chan_user.h b/arch/um/include/shared/chan_user.h → arch/um/drivers/chan_user.h
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
@@ -7,7 +7,7 @@
 #include "linux/kd.h"
 #include "linux/sched.h"
 #include "linux/slab.h"
-#include "chan_kern.h"
+#include "chan.h"
 #include "irq_kern.h"
 #include "irq_user.h"
 #include "kern_util.h"

diff --git a/arch/um/include/shared/line.h → arch/um/drivers/line.h b/arch/um/include/shared/line.h → arch/um/drivers/line.h
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
@@ -12,9 +12,8 @@
 #include "linux/console.h"
 #include "asm/termbits.h"
 #include "asm/irq.h"
-#include "line.h"
 #include "ssl.h"
-#include "chan_kern.h"
+#include "chan.h"
 #include "init.h"
 #include "irq_user.h"
 #include "mconsole_kern.h"

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
@@ -20,8 +20,7 @@
 #include "asm/current.h"
 #include "asm/irq.h"
 #include "stdio_console.h"
-#include "line.h"
-#include "chan_kern.h"
+#include "chan.h"
 #include "irq_user.h"
 #include "mconsole_kern.h"
 #include "init.h"

diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
@@ -13,7 +13,7 @@
 #include <sys/wait.h>
 #include <asm/unistd.h>
 #include "as-layout.h"
-#include "chan_user.h"
+#include "init.h"
 #include "kern_util.h"
 #include "mem.h"
 #include "os.h"