diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /include/uapi/linux/serial_core.h | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'include/uapi/linux/serial_core.h')
| -rw-r--r-- | include/uapi/linux/serial_core.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index 9119cc0977bf..b47dba2c1e6f 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h | |||
| @@ -232,4 +232,10 @@ | |||
| 232 | /* SH-SCI */ | 232 | /* SH-SCI */ |
| 233 | #define PORT_HSCIF 104 | 233 | #define PORT_HSCIF 104 |
| 234 | 234 | ||
| 235 | /* ST ASC type numbers */ | ||
| 236 | #define PORT_ASC 105 | ||
| 237 | |||
| 238 | /* Tilera TILE-Gx UART */ | ||
| 239 | #define PORT_TILEGX 106 | ||
| 240 | |||
| 235 | #endif /* _UAPILINUX_SERIAL_CORE_H */ | 241 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |