2 files changed, 5 insertions, 3 deletions

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 3652b239dad1..d473e5ed044c 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1591,7 +1591,7 @@ enum ethtool_link_mode_bit_indices {
 
 static inline int ethtool_validate_speed(__u32 speed)
 {
-        return speed <= INT_MAX || speed == SPEED_UNKNOWN;
+        return speed <= INT_MAX || speed == (__u32)SPEED_UNKNOWN;
 }
 
 /* Duplex, half or full. */
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 7f14d4a66c28..64cee116928e 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -439,10 +439,12 @@
 #define KEY_TITLE               0x171
 #define KEY_SUBTITLE            0x172
 #define KEY_ANGLE               0x173
-#define KEY_ZOOM                0x174
+#define KEY_FULL_SCREEN         0x174   /* AC View Toggle */
+#define KEY_ZOOM                KEY_FULL_SCREEN
 #define KEY_MODE                0x175
 #define KEY_KEYBOARD            0x176
-#define KEY_SCREEN              0x177
+#define KEY_ASPECT_RATIO        0x177   /* HUTRR37: Aspect */
+#define KEY_SCREEN              KEY_ASPECT_RATIO
 #define KEY_PC                  0x178   /* Media Select Computer */
 #define KEY_TV                  0x179   /* Media Select TV */
 #define KEY_TV2                 0x17a   /* Media Select Cable */