Patch from Anders Blomdell <anders.blomdell@control.lth.se>:

Now it compiles on 2.6.21...

diff --git a/comedi/drivers/Kbuild b/comedi/drivers/Kbuild
index b3b87e2841a263c2e7c1138e4f828a5b85011765..210e8aa350df43619f6a97a0122e0a3c3938e153 100644 (file)
--- a/comedi/drivers/Kbuild
+++ b/comedi/drivers/Kbuild
@@ -99,6 +99,7 @@ obj-m += comedi_parport.o
 obj-m += rtd520.o
 obj-m += rti800.o
 obj-m += rti802.o
+obj-m += serial2002.o
 obj-m += skel.o
 obj-m += ssv_dnp.o
 obj-m += s526.o

diff --git a/comedi/drivers/Makefile.am b/comedi/drivers/Makefile.am
index 55692c341c01fd9662ccea47984bcb475afcc0e6..783d2c32a83ccf81712e7f5cdffc2743a4cdc879 100644 (file)
--- a/comedi/drivers/Makefile.am
+++ b/comedi/drivers/Makefile.am
@@ -169,6 +169,7 @@ module_PROGRAMS = \
  rtd520.ko \
  rti800.ko \
  rti802.ko \
+ serial2002.ko \
  skel.ko \
  ssv_dnp.ko \
  s526.ko \
@@ -271,6 +272,7 @@ comedi_rt_timer_ko_SOURCES = comedi_rt_timer.c
 rtd520_ko_SOURCES = rtd520.c
 rti800_ko_SOURCES = rti800.c
 rti802_ko_SOURCES = rti802.c
+serial2002_ko_SOURCES = serial2002.c
 skel_ko_SOURCES = skel.c
 ssv_dnp_ko_SOURCES = ssv_dnp.c
 s526_ko_SOURCES = s526.c

diff --git a/comedi/drivers/serial2002.c b/comedi/drivers/serial2002.c
index c03a3545b032850c4028ee8d928a1c38629e0326..101dc56d66eac8e10977acc949b044e9b7245997 100644 (file)
--- a/comedi/drivers/serial2002.c
+++ b/comedi/drivers/serial2002.c
@@ -36,7 +36,7 @@ Status: in development
 #include <linux/delay.h>
 #include <linux/ioport.h>
 
-#include <termios.h>
+#include <asm/termios.h>
 #include <asm/ioctls.h>
 #include <linux/serial.h>
 #include <linux/poll.h>