Pull remove-hotkey into release branch

[firefly-linux-kernel-4.4.55.git] / include / asm-x86_64 / io_apic.h

diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index 561ecbfd4cb5604bce14e7ed2fc51848dbcae244..f4fb238c89f14212f84b51a9258fc5960a69a46d 100644 (file)
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -85,18 +85,8 @@ struct IO_APIC_route_entry {
                mask            :  1,   /* 0: enabled, 1: disabled */
                __reserved_2    : 15;
 
-       union {         struct { __u32
-                                       __reserved_1    : 24,
-                                       physical_dest   :  4,
-                                       __reserved_2    :  4;
-                       } physical;
-
-                       struct { __u32
-                                       __reserved_1    : 24,
-                                       logical_dest    :  8;
-                       } logical;
-       } dest;
-
+       __u32   __reserved_3    : 24,
+               dest            :  8;
 } __attribute__ ((packed));
 
 /*