History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two easy cases of overlapping changes.

David S. Miller committed 7 years ago

Commit 8b448362 parents c049d56 cd8dead247 files · +1881 −715Browse files

Showing the changes to include/uapi/linux (1 of 247 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+4−2
@@ -439,10 +439,12 @@ · 438 unmodified lines
439439 #define KEY_TITLE 0x171
440440 #define KEY_SUBTITLE 0x172
441441 #define KEY_ANGLE 0x173
442−#define KEY_ZOOM 0x174
442+#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */
443+#define KEY_ZOOM KEY_FULL_SCREEN
443444 #define KEY_MODE 0x175
444445 #define KEY_KEYBOARD 0x176
445−#define KEY_SCREEN 0x177
446+#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */
447+#define KEY_SCREEN KEY_ASPECT_RATIO
446448 #define KEY_PC 0x178 /* Media Select Computer */
447449 #define KEY_TV 0x179 /* Media Select TV */
448450 #define KEY_TV2 0x17a /* Media Select Cable */