--- a/libserial-newlnx/baudtab.c	Fri Sep 22 00:09:37 2017 +0000
+++ b/libserial-newlnx/baudtab.c	Fri Sep 22 00:19:41 2017 +0000
@@ -7,25 +7,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <termios.h>
+#include <asm/termbits.h>
 #include "baudrate.h"
 
 struct baudrate baud_rate_table[] = {
 	/* the first listed rate will be our default */
-	{"115200",	B115200,	0},
-	{"57600",	B57600,		1},
-	{"38400",	B38400,		2},
-	{"19200",	B19200,		4},
-	/*
-	 * Non-standard high baud rates remapped by CP2102 EEPROM programming
-	 * or by a hacky patch to the ftdi_sio Linux kernel driver to work
-	 * with FTDI adapters.
-	 */
-	{"812500",	B921600,	-1},
-	{"406250",	B460800,	-1},
-	{"203125",	B230400,	-1},
+	{"115200",	B115200,	0,	0},
+	{"57600",	B57600,		0,	1},
+	{"38400",	B38400,		0,	2},
+	{"19200",	B19200,		0,	4},
+	/* Non-standard high baud rates */
+	{"812500",	BOTHER,		812500,	-1},
+	{"406250",	BOTHER,		406250,	-1},
+	{"203125",	BOTHER,		203125,	-1},
 	/* table search terminator */
-	{NULL,		B0,		-1},
+	{NULL,		B0,		0,	-1},
 };
 
 struct baudrate *