diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
| commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
| tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /include/uapi/linux | |
| parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/serial.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/tc_act/Kbuild | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 5e0d0ed61cf3..25331f9faa76 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -65,6 +65,10 @@ struct serial_struct { #define SERIAL_IO_PORT 0 #define SERIAL_IO_HUB6 1 #define SERIAL_IO_MEM 2 +#define SERIAL_IO_MEM32 3 +#define SERIAL_IO_AU 4 +#define SERIAL_IO_TSI 5 +#define SERIAL_IO_MEM32BE 6 #define UART_CLEAR_FIFO 0x01 #define UART_USE_FIFO 0x02 diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 19d5219b0b99..242cf0c6e33d 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -9,3 +9,4 @@ header-y += tc_pedit.h header-y += tc_skbedit.h header-y += tc_vlan.h header-y += tc_bpf.h +header-y += tc_connmark.h |