Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / staging / ozwpan / ozcdev.c

diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
index 1c380d6879639a90b0d5d3b251538342888eebda..27325f74ecdc3dd4faf0110a36d993ed09f98365 100644 (file)
--- a/drivers/staging/ozwpan/ozcdev.c
+++ b/drivers/staging/ozwpan/ozcdev.c
@@ -39,9 +39,6 @@ struct oz_serial_ctx {
        int rd_in;
        int rd_out;
 };
-/*------------------------------------------------------------------------------
- */
-int g_taction;
 /*------------------------------------------------------------------------------
  */
 static struct oz_cdev g_cdev;
@@ -276,20 +273,6 @@ long oz_cdev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                                return -EFAULT;
                }
                break;
-#ifdef WANT_EVENT_TRACE
-       case OZ_IOCTL_CLEAR_EVENTS:
-               oz_events_clear();
-               break;
-       case OZ_IOCTL_GET_EVENTS:
-               rc = oz_events_copy((void __user *)arg);
-               break;
-       case OZ_IOCTL_SET_EVENT_MASK:
-               if (copy_from_user(&g_evt_mask, (void __user *)arg,
-                       sizeof(unsigned long))) {
-                       return -EFAULT;
-               }
-               break;
-#endif /* WANT_EVENT_TRACE */
        case OZ_IOCTL_ADD_BINDING:
        case OZ_IOCTL_REMOVE_BINDING: {
                        struct oz_binding_info b;