diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 13:25:44 -0400 |
| commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
| tree | 592283e59e121b76355836295d6016fe33cfc5d1 /include/uapi/linux/serial_core.h | |
| parent | 17638db1b88184d8895f3f4551c936d7480a1d3f (diff) | |
| parent | cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (diff) | |
Merge remote branch 'origin/master' into next-merge
Diffstat (limited to 'include/uapi/linux/serial_core.h')
| -rw-r--r-- | include/uapi/linux/serial_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index 9119cc0977bf..e40ebe124ced 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h | |||
| @@ -232,4 +232,7 @@ | |||
| 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 | |||
| 235 | #endif /* _UAPILINUX_SERIAL_CORE_H */ | 238 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |