--- uc-origs/uClinux-2.4.6.0pre1/drivers/char/Makefile	2004-12-12 20:07:04.000000000 +0100
+++ uClinux-2.4.6.0pre1.working1/drivers/char/Makefile	2005-01-04 19:34:24.000000000 +0100
@@ -139,9 +139,12 @@
 obj-$(CONFIG_SERIAL_CLPS711X) += serial_clps711x.o
 obj-$(CONFIG_SERIAL_DSC21) += serial_dsc21.o
 obj-$(CONFIG_SERIAL_ATMEL) += serial_atmel.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
--- uc-origs/uClinux-2.4.6.0pre1/drivers/char/tty_io.c	2004-12-12 20:07:04.000000000 +0100
+++ uClinux-2.4.6.0pre1.working1/drivers/char/tty_io.c	2005-01-04 19:34:15.000000000 +0100
@@ -162,6 +162,7 @@
 extern void m68328_console_init(void);
 extern void mcfrs_console_init(void);
 extern void atmel_console_init(void);
+extern void serial_cnxt_console_init(void);
 
 #ifndef MIN
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
@@ -2241,6 +2242,9 @@
 #ifdef CONFIG_SERIAL_ATMEL
 	atmel_console_init();
 #endif
+#ifdef CONFIG_SERIAL_CNXT
+	serial_cnxt_console_init();
+#endif
 }
 
 static struct tty_driver dev_tty_driver, dev_syscons_driver;