diff -Naur -X linux-2.6.31-git8-driver-core.current/Documentation/dontdiff linux-2.6.31-git8-driver-core.current/drivers/isdn/gigaset/interface.c linux-2.6.31-git8-tty.current/drivers/isdn/gigaset/interface.c
--- linux-2.6.31-git8-driver-core.current/drivers/isdn/gigaset/interface.c	2009-09-10 15:03:25.000000000 -0700
+++ linux-2.6.31-git8-tty.current/drivers/isdn/gigaset/interface.c	2009-09-18 10:25:11.000000000 -0700
@@ -408,33 +408,28 @@
 	return retval;
 }
 
-/* FIXME: This function does not have error returns */
-
 static int if_chars_in_buffer(struct tty_struct *tty)
 {
 	struct cardstate *cs;
-	int retval = -ENODEV;
+	int retval = 0;
 
 	cs = (struct cardstate *) tty->driver_data;
 	if (!cs) {
 		pr_err("%s: no cardstate\n", __func__);
-		return -ENODEV;
+		return 0;
 	}
 
 	gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-	if (mutex_lock_interruptible(&cs->mutex))
-		return -ERESTARTSYS; // FIXME -EINTR?
+	mutex_lock(&cs->mutex);
 
-	if (!cs->connected) {
+	if (!cs->connected)
 		gig_dbg(DEBUG_IF, "not connected");
-		retval = -ENODEV;
-	} else if (!cs->open_count)
+	else if (!cs->open_count)
 		dev_warn(cs->dev, "%s: device not opened\n", __func__);
-	else if (cs->mstate != MS_LOCKED) {
+	else if (cs->mstate != MS_LOCKED)
 		dev_warn(cs->dev, "can't write to unlocked device\n");
-		retval = -EBUSY;
-	} else
+	else
 		retval = cs->ops->chars_in_buffer(cs);
 
 	mutex_unlock(&cs->mutex);
diff -Naur -X linux-2.6.31-git8-driver-core.current/Documentation/dontdiff linux-2.6.31-git8-driver-core.current/drivers/serial/bfin_5xx.c linux-2.6.31-git8-tty.current/drivers/serial/bfin_5xx.c
--- linux-2.6.31-git8-driver-core.current/drivers/serial/bfin_5xx.c	2009-09-10 15:03:33.000000000 -0700
+++ linux-2.6.31-git8-tty.current/drivers/serial/bfin_5xx.c	2009-09-18 10:25:12.000000000 -0700
@@ -42,6 +42,10 @@
 # undef CONFIG_EARLY_PRINTK
 #endif
 
+#ifdef CONFIG_SERIAL_BFIN_MODULE
+# undef CONFIG_EARLY_PRINTK
+#endif
+
 /* UART name and device definitions */
 #define BFIN_SERIAL_NAME	"ttyBF"
 #define BFIN_SERIAL_MAJOR	204
diff -Naur -X linux-2.6.31-git8-driver-core.current/Documentation/dontdiff linux-2.6.31-git8-driver-core.current/drivers/serial/serial_cs.c linux-2.6.31-git8-tty.current/drivers/serial/serial_cs.c
--- linux-2.6.31-git8-driver-core.current/drivers/serial/serial_cs.c	2009-09-18 10:20:35.000000000 -0700
+++ linux-2.6.31-git8-tty.current/drivers/serial/serial_cs.c	2009-09-18 10:25:12.000000000 -0700
@@ -884,6 +884,7 @@
 	PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
 	PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
 	PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
+	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),