Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

Greg Kroah-Hartman committed 13 years ago

Commit 9f9cba82 parents dbf5bef 949db15591 files · +12062 −3482Browse files

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

Unified · Split

2 files

 #include <linux/types.h>
 #include <linux/elf-em.h>
-#include <linux/ptrace.h>
 /* The netlink messages for the audit system is divided into blocks:
  * 1000 - 1099 are for commanding the audit system
 #define AUDIT_MMAP		1323	/* Record showing descriptor and flags in mmap */
 #define AUDIT_NETFILTER_PKT	1324	/* Packets traversing netfilter chains */
 #define AUDIT_NETFILTER_CFG	1325	/* Netfilter chain modifications */
+#define AUDIT_SECCOMP		1326	/* Secure Computing event */
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */

@@ -50,7 +50,8 @@ · 49 unmodified lines
50	#define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */	50	#define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */
51	#define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */	51	#define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */
52	#define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */	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	* ARM specific type numbers. These are not currently guaranteed	57	* ARM specific type numbers. These are not currently guaranteed

Keyboard shortcuts