Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / char / pcmcia / ipwireless / tty.h

diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/char/pcmcia/ipwireless/tty.h
index 3e163d4cab15b034d14153d5dcb2d1f6bdeae36e..747b2d63786093058213b5aea75724a9cc68960e 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/tty.h
+++ b/drivers/char/pcmcia/ipwireless/tty.h
@@ -21,7 +21,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>