diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:56:39 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:56:39 +1000 |
commit | d173604c97d13fad8cdb02c09826d00c66585fca (patch) | |
tree | dae1c96c163f2c97246b08006915c95c255b1ff1 /drivers/pcmcia/xxs1500_ss.c | |
parent | 0c1f7fadf938273b0d8e0457772dfe8e297ab208 (diff) | |
parent | 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f (diff) |
Merge remote branch 'pcmcia/master'
Diffstat (limited to 'drivers/pcmcia/xxs1500_ss.c')
-rw-r--r-- | drivers/pcmcia/xxs1500_ss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index 201ccfa1e97b..fa88c360c37a 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c @@ -17,7 +17,6 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/ss.h> #include <pcmcia/cistpl.h> |