aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/020-disable_tty_set_termios.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-12 08:19:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-12 08:19:04 +0000
commitd1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch)
treeb4d150683b180b04da569f049a53d592956d705b /package/mac80211/patches/020-disable_tty_set_termios.patch
parent700de21fec69cc8b11374be00d04660ffbd48943 (diff)
downloadupstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz
upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2
upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/020-disable_tty_set_termios.patch')
-rw-r--r--package/mac80211/patches/020-disable_tty_set_termios.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/020-disable_tty_set_termios.patch b/package/mac80211/patches/020-disable_tty_set_termios.patch
index fc5d4d63fb..89c6a60e13 100644
--- a/package/mac80211/patches/020-disable_tty_set_termios.patch
+++ b/package/mac80211/patches/020-disable_tty_set_termios.patch
@@ -1,14 +1,14 @@
--- a/compat/compat-2.6.39.c
+++ b/compat/compat-2.6.39.c
-@@ -12,6 +12,7 @@
- #include <linux/tty.h>
+@@ -13,6 +13,7 @@
#include <linux/sched.h>
+ #include <linux/module.h>
+#ifdef CONFIG_COMPAT_BLUETOOTH
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
/*
* Termios Helper Methods
-@@ -111,4 +112,4 @@ int tty_set_termios(struct tty_struct *t
+@@ -112,4 +113,4 @@ int tty_set_termios(struct tty_struct *t
}
EXPORT_SYMBOL_GPL(tty_set_termios);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) */