diff -ur linux-2.4.6.uc0pre0.orig/drivers/char/Makefile linux-2.4.6.uc0pre0.actiontec/drivers/char/Makefile
--- linux-2.4.6.uc0pre0.orig/drivers/char/Makefile	2004-12-05 18:19:04.000000000 +0100
+++ linux-2.4.6.uc0pre0.actiontec/drivers/char/Makefile	2004-12-05 18:22:23.000000000 +0100
@@ -138,9 +138,12 @@
 obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
 obj-$(CONFIG_SERIAL_CLPS711X) += serial_clps711x.o
 obj-$(CONFIG_SERIAL_DSC21) += serial_dsc21.o
+obj-$(CONFIG_SERIAL_CNXT) += cnxtserial.o
 
 ifndef CONFIG_SUN_KEYBOARD
-  obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
+# mleslie
+  obj-$(CONFIG_VT) += $(KEYMAP) $(KEYBD)
+#  obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
 else
   obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
 endif
diff -ur linux-2.4.6.uc0pre0.orig/drivers/char/tty_io.c linux-2.4.6.uc0pre0.actiontec/drivers/char/tty_io.c
--- linux-2.4.6.uc0pre0.orig/drivers/char/tty_io.c	2004-12-05 18:19:04.000000000 +0100
+++ linux-2.4.6.uc0pre0.actiontec/drivers/char/tty_io.c	2004-12-05 18:24:56.000000000 +0100
@@ -161,6 +161,7 @@
 extern void sci_console_init(void);
 extern void m68328_console_init(void);
 extern void mcfrs_console_init(void);
+extern void serial_cnxt_console_init(void);
 
 #ifndef MIN
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
@@ -2237,7 +2238,9 @@
 #if defined (CONFIG_M68360_SMC_UART) || defined (CONFIG_M68360_SCC_UART)
     rs_360_init();
 #endif
-
+#ifdef CONFIG_SERIAL_CNXT
+	serial_cnxt_console_init();
+#endif
 }
 
 static struct tty_driver dev_tty_driver, dev_syscons_driver;

