diff --git a/[refs] b/[refs] index c4d5b9a3142e..98e7f3da9e8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0bd14af51a470895448f88edd1315c4fa0b0d27 +refs/heads/master: 6b13eb1baa17b8746f96bd536d2897ec86e823d9 diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c index 3ced75f765ca..996cdc5abb85 100644 --- a/trunk/fs/compat_ioctl.c +++ b/trunk/fs/compat_ioctl.c @@ -608,7 +608,6 @@ struct serial_struct32 { static int serial_struct_ioctl(unsigned fd, unsigned cmd, struct serial_struct32 __user *ss32) { - typedef struct serial_struct SS; typedef struct serial_struct32 SS32; int err; struct serial_struct ss;