diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 10:44:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 10:44:22 -0800 |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /include/linux/tty.h | |
| parent | 412dc7f368bf10a8049a8a4c41abbfd0108742e7 (diff) | |
| parent | 72083646528d4887b920deb71b37e09bc7d227bb (diff) | |
Merge branch 'master' into work
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index c7ea9bc8897c..032d79ff1d9d 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -13,7 +13,6 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> #include <linux/mutex.h> -#include <linux/smp_lock.h> #include <asm/system.h> |