Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / include / uapi / linux / serial_core.h

diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index b466487bb5da4917800647af6a040376f1bd2070..b47dba2c1e6f7ad2a50c5d17bb6d4d6fa23a095b 100644 (file)
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -232,7 +232,10 @@
 /* SH-SCI */
 #define PORT_HSCIF     104
 
+/* ST ASC type numbers */
+#define PORT_ASC       105
+
 /* Tilera TILE-Gx UART */
-#define PORT_TILEGX    105
+#define PORT_TILEGX    106
 
 #endif /* _UAPILINUX_SERIAL_CORE_H */