Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 3ced75f765ca069d12e6da7b1e4c38aa015f5279..996cdc5abb85dae304b85cd479aaa20de5135a5e 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/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;