summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/tcic.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
committerNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
commitfd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch)
tree311567d03758afc3a93b4273fe172836e89bb01d /drivers/pcmcia/tcic.c
parentmd: clean up do_md_stop (diff)
parentMerge branch 'async' of macbook:git/btrfs-unstable (diff)
downloadlinux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz
linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'drivers/pcmcia/tcic.c')
-rw-r--r--drivers/pcmcia/tcic.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 56004a1b5bba..be0d841c7ebd 100644
--- 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_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
#include "tcic.h"