From a4a5121ff37c87030fbd4253d2857d35574cab73 Mon Sep 17 00:00:00 2001
From: Jaeden Amero <jaeden.amero@ni.com>
Date: Mon, 24 Sep 2012 10:39:45 -0500
Subject: [PATCH] --- yaml --- r: 325775 b: refs/heads/master c:
 142e5460a66edbfe881474eb422e86ff61c4bfc7 h: refs/heads/master i:   325773:
 e2cdb4fb0f15f34354f9aef5b9e8f7d00e2aaa35   325771:
 44a2a88276937ee1df77c93a3d8b0ca2d48c4b11   325767:
 45907f52c1ef8e02aa2fa12b9054e1efdef24aa8   325759:
 8d713cdf49df1f3dea62ee70c97ed5ebea5d61ef v: v3

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

diff --git a/[refs] b/[refs]
index 1f2ca3fe759d..9c21284fa97f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac57e7f38ea6fe7358cd0b7a2f2d21aef5ab70cd
+refs/heads/master: 142e5460a66edbfe881474eb422e86ff61c4bfc7
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index 85dfebfe6820..59f8db4a39a7 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -866,8 +866,12 @@ COMPATIBLE_IOCTL(TIOCGPTN)
 COMPATIBLE_IOCTL(TIOCSPTLCK)
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
 COMPATIBLE_IOCTL(TIOCSIG)
+#ifdef TIOCSRS485
 COMPATIBLE_IOCTL(TIOCSRS485)
+#endif
+#ifdef TIOCGRS485
 COMPATIBLE_IOCTL(TIOCGRS485)
+#endif
 #ifdef TCGETS2
 COMPATIBLE_IOCTL(TCGETS2)
 COMPATIBLE_IOCTL(TCSETS2)