From e7a4b18a81539a8f1cd5824fd4193807113284ed Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Thu, 27 Apr 2006 12:01:18 -0300
Subject: [PATCH] --- yaml --- r: 29863 b: refs/heads/master c:
 1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4 h: refs/heads/master i:   29861:
 9be1effb78a38d5b5986039eb56f09d717e9f33f   29859:
 f2e2f82a407d8871cf0efd2c052b405b30c02d2a   29855:
 824d79dae4c2d67856c7e778e60fb751f1d77d37 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/compat_ioctl.c | 33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 76c24bd6e017..9e64e9353a6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a17ef975648ce96b6a83b872b6ff4be6fdcd2a4
+refs/heads/master: 1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index d2c38875ab29..9eb9824dd332 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -205,38 +205,6 @@ static int do_ext3_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
 	return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg));
 }
 
-struct compat_dmx_event {
-	dmx_event_t	event;
-	compat_time_t	timeStamp;
-	union
-	{
-		dmx_scrambling_status_t scrambling;
-	} u;
-};
-
-static int do_dmx_get_event(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-	struct dmx_event kevent;
-	mm_segment_t old_fs = get_fs();
-	int err;
-
-	set_fs(KERNEL_DS);
-	err = sys_ioctl(fd, cmd, (unsigned long) &kevent);
-	set_fs(old_fs);
-
-	if (!err) {
-		struct compat_dmx_event __user *up = compat_ptr(arg);
-
-		err  = put_user(kevent.event, &up->event);
-		err |= put_user(kevent.timeStamp, &up->timeStamp);
-		err |= put_user(kevent.u.scrambling, &up->u.scrambling);
-		if (err)
-			err = -EFAULT;
-	}
-
-	return err;
-}
-
 struct compat_video_event {
 	int32_t		type;
 	compat_time_t	timestamp;
@@ -2964,7 +2932,6 @@ HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)
 #endif
 
 /* dvb */
-HANDLE_IOCTL(DMX_GET_EVENT, do_dmx_get_event)
 HANDLE_IOCTL(VIDEO_GET_EVENT, do_video_get_event)
 HANDLE_IOCTL(VIDEO_STILLPICTURE, do_video_stillpicture)
 HANDLE_IOCTL(VIDEO_SET_SPU_PALETTE, do_video_set_spu_palette)