---

yaml --- r: 273029 b: refs/heads/master c: 510c72a h: refs/heads/master i: 273027: 230019a v: v3
git-mirror · Nov 2, 2011 · 42d78ef · 42d78ef
1 parent a88015e
commit 42d78ef
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17e052093bcd21eaf9eb6e792cd76fdc4f0e3505
+refs/heads/master: 510c72a3cf51c9463db64eb6c21347f4940a202f
diff --git a/trunk/arch/um/include/shared/chan_kern.h → trunk/arch/um/drivers/chan.h b/trunk/arch/um/include/shared/chan_kern.h → trunk/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/trunk/arch/um/drivers/chan_kern.c b/trunk/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/trunk/arch/um/include/shared/chan_user.h → trunk/arch/um/drivers/chan_user.h b/trunk/arch/um/include/shared/chan_user.h → trunk/arch/um/drivers/chan_user.h
diff --git a/trunk/arch/um/drivers/line.c b/trunk/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/trunk/arch/um/include/shared/line.h → trunk/arch/um/drivers/line.h b/trunk/arch/um/include/shared/line.h → trunk/arch/um/drivers/line.h
diff --git a/trunk/arch/um/drivers/ssl.c b/trunk/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/trunk/arch/um/drivers/stdio_console.c b/trunk/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/trunk/arch/um/os-Linux/skas/process.c b/trunk/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"