From d201c0929b4aed2b36fc1ecae06a816657e6769b Mon Sep 17 00:00:00 2001
From: Jaeden Amero <jaeden.amero@ni.com>
Date: Wed, 19 Sep 2012 15:34:31 +0100
Subject: [PATCH] --- yaml --- r: 325768 b: refs/heads/master c:
 84c3b84860440a9e3a3666c14112f41311b8f623 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/compat_ioctl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 647c29bc1a7a..869f7064e389 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b6d45c211a401a9bdeebfa96f8a4c811bd3eeaf
+refs/heads/master: 84c3b84860440a9e3a3666c14112f41311b8f623
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index debdfe0fc809..85dfebfe6820 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -866,6 +866,8 @@ COMPATIBLE_IOCTL(TIOCGPTN)
 COMPATIBLE_IOCTL(TIOCSPTLCK)
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
 COMPATIBLE_IOCTL(TIOCSIG)
+COMPATIBLE_IOCTL(TIOCSRS485)
+COMPATIBLE_IOCTL(TIOCGRS485)
 #ifdef TCGETS2
 COMPATIBLE_IOCTL(TCGETS2)
 COMPATIBLE_IOCTL(TCSETS2)