Merge remote-tracking branch 'spi/fix/grant' into spi-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 4e80421fd9084d02433aea7f1c0561edcd2c6192..aa628ed0e9f48178ca3ac9b1fbba39a370877228 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 
 #include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"