Merge branch 'btrfs-3.0' into for-linus

[karo-tx-linux.git] / drivers / pcmcia / tcic.c

diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index be0d841c7ebd9d9e2bb1407a4165ee92623105ec..310160bffe382c46ac6cda7a3c848bbcb2646d0a 100644 (file)
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -49,7 +49,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 #include "tcic.h"