Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / i386 / mach-voyager / voyager_thread.c

diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c
index a9341b0eebffa396199db1b268707b6ba893b782..f39887359e8e86ea8758dc3d2c686a283a9c8590 100644 (file)
--- a/arch/i386/mach-voyager/voyager_thread.c
+++ b/arch/i386/mach-voyager/voyager_thread.c
@@ -14,7 +14,6 @@
  * */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
 #include <linux/delay.h>
@@ -31,8 +30,6 @@
 #include <asm/mtrr.h>
 #include <asm/msr.h>
 
-#include <linux/irq.h>
-
 #define THREAD_NAME "kvoyagerd"
 
 /* external variables */
@@ -133,7 +130,6 @@ thread(void *unused)
        init_timer(&wakeup_timer);
 
        sigfillset(&current->blocked);
-       current->signal->tty = NULL;
 
        printk(KERN_NOTICE "Voyager starting monitor thread\n");