diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/irda/ircomm/ircomm_tty_ioctl.c | |
parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
download | talos-op-linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.gz talos-op-linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'net/irda/ircomm/ircomm_tty_ioctl.c')
-rw-r--r-- | net/irda/ircomm/ircomm_tty_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c index a5174e6e7ad3..6030947b6d93 100644 --- a/net/irda/ircomm/ircomm_tty_ioctl.c +++ b/net/irda/ircomm/ircomm_tty_ioctl.c @@ -30,7 +30,6 @@ #include <linux/init.h> #include <linux/fs.h> -#include <linux/sched.h> #include <linux/termios.h> #include <linux/tty.h> #include <linux/serial.h> |