Removed selection.h header. It is not needed and in the future selections will be...

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 2149e30bbca2cbf2ecc9e820f0a90f6947621077..27bed88f265269ca7047bcd67cca988465a29c71 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -48,7 +48,6 @@
 #include <linux/init.h>
 
 #include <linux/tty.h>
-#include <linux/selection.h>
 #include <linux/kmod.h>
 
 #include "busmouse.h"

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 00aa3598c95180714b546058616f1a7cc4ae6d68..e89b692a2dedf3af46df8f6a87f081488bb2bd3f 100644 (file)
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -65,7 +65,7 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout)
        if (tty->driver.wait_until_sent)
                tty->driver.wait_until_sent(tty, timeout);
 stop_waiting:
-       current->state = TASK_RUNNING;
+       set_current_state(TASK_RUNNING);
        remove_wait_queue(&tty->write_wait, &wait);
 }