This resolves a number of tty driver merge issues found in linux-next
Showing the changes to include/uapi/linux (2 of 591 files). Show all
Unified · Split
| @@ -26,7 +26,6 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <linux/types.h> |
| 28 | 28 | #include <linux/elf-em.h> |
| 29 | −#include <linux/ptrace.h> | |
| 30 | 29 | |
| 31 | 30 | /* The netlink messages for the audit system is divided into blocks: |
| 32 | 31 | * 1000 - 1099 are for commanding the audit system |
| @@ -106,6 +105,7 @@ · 73 unmodified lines | ||
| 106 | 105 | #define AUDIT_MMAP 1323 /* Record showing descriptor and flags in mmap */ |
| 107 | 106 | #define AUDIT_NETFILTER_PKT 1324 /* Packets traversing netfilter chains */ |
| 108 | 107 | #define AUDIT_NETFILTER_CFG 1325 /* Netfilter chain modifications */ |
| 108 | +#define AUDIT_SECCOMP 1326 /* Secure Computing event */ | |
| 109 | 109 | |
| 110 | 110 | #define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ |
| 111 | 111 | #define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ |
| @@ -50,7 +50,8 @@ · 49 unmodified lines | ||
| 50 | 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ |
| 51 | 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ |
| 52 | 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ |
| 53 | −#define PORT_MAX_8250 24 /* max port ID */ | |
| 53 | +#define PORT_BRCM_TRUMANAGE 24 | |
| 54 | +#define PORT_MAX_8250 25 /* max port ID */ | |
| 54 | 55 | |
| 55 | 56 | /* |
| 56 | 57 | * ARM specific type numbers. These are not currently guaranteed |