From eefd0c5843a739cb25d491cd296b2cd3416b11d4 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 9 Jan 2006 20:52:05 -0800
Subject: [PATCH] --- yaml --- r: 17566 b: refs/heads/master c:
 51a990588a3e38f7963964813786fa4f0da43ecc h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/kernel/compat_ioctl.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4af619d8d516..01a7e1d9a0ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f75e00c9ac5c7b127b5f1f48f1dc421be507133
+refs/heads/master: 51a990588a3e38f7963964813786fa4f0da43ecc
diff --git a/trunk/arch/s390/kernel/compat_ioctl.c b/trunk/arch/s390/kernel/compat_ioctl.c
index 9cf8fd24cd21..da473bda962f 100644
--- a/trunk/arch/s390/kernel/compat_ioctl.c
+++ b/trunk/arch/s390/kernel/compat_ioctl.c
@@ -65,10 +65,6 @@ COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
 COMPATIBLE_IOCTL(BIODASDREADALLCMB)
 
 COMPATIBLE_IOCTL(TAPE390_DISPLAY)
-
-/* s390 doesn't need handlers here */
-COMPATIBLE_IOCTL(TIOCGSERIAL)
-COMPATIBLE_IOCTL(TIOCSSERIAL)
 };
 
 int ioctl_table_size = ARRAY_SIZE(ioctl_start);