History

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

Just several instances of overlapping changes.

David S. Miller committed 10 years ago

Commit de0ba9a2 parents d95a93a 107df03276 files · +2475 −1313Browse files

Showing the changes to include/uapi (2 of 276 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/input-event-codes.h +1 −0
include/uapi/linux/Kbuild+1−0
@@ -245,6 +245,7 @@ endif · 244 unmodified lines
245245 header-y += hw_breakpoint.h
246246 header-y += l2tp.h
247247 header-y += libc-compat.h
248+header-y += lirc.h
248249 header-y += limits.h
249250 header-y += llc.h
250251 header-y += loop.h
include/uapi/linux/input-event-codes.h+1−0
@@ -780,6 +780,7 @@ · 779 unmodified lines
780780 #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
781781 #define SW_LINEIN_INSERT 0x0d /* set = inserted */
782782 #define SW_MUTE_DEVICE 0x0e /* set = device disabled */
783+#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
783784 #define SW_MAX 0x0f
784785 #define SW_CNT (SW_MAX+1)
785786

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t