diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 42c81c048b..0298f9b403 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-17	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libnetworking/sys/conf.h: Remove linesw, struct linesw, nlinesw.
+	(Clash with termiostypes.h - PR 1229).
+
 2007-03-16	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* score/include/rtems/score/wkspace.h,
diff --git a/cpukit/libnetworking/sys/conf.h b/cpukit/libnetworking/sys/conf.h
index 207acfe33d..5a9cacde1e 100644
--- a/cpukit/libnetworking/sys/conf.h
+++ b/cpukit/libnetworking/sys/conf.h
@@ -122,29 +122,6 @@ struct cdevsw {
 extern struct cdevsw *cdevsw[];
 #endif
 
-/*
- * Line discipline switch table
- */
-struct linesw {
-	l_open_t	*l_open;
-	l_close_t	*l_close;
-	l_read_t	*l_read;
-	l_write_t	*l_write;
-	l_ioctl_t	*l_ioctl;
-	l_rint_t	*l_rint;
-	l_start_t	*l_start;
-	l_modem_t	*l_modem;
-};
-
-#ifdef _KERNEL
-extern struct linesw linesw[];
-extern int nlinesw;
-
-int ldisc_register __P((int , struct linesw *));
-void ldisc_deregister __P((int));
-#define LDISC_LOAD 	-1		/* Loadable line discipline */
-#endif
-
 /*
  * Swap device table
  */