git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[sfrench/cifs-2.6.git]
/
drivers
/
pcmcia
/
cs.c
diff --git
a/drivers/pcmcia/cs.c
b/drivers/pcmcia/cs.c
index ac004248324ac7f1e0301f738b4d3154ef32d4f4..50cad3a59a6c236696276bfd2a160cd00d770c17 100644
(file)
--- a/
drivers/pcmcia/cs.c
+++ b/
drivers/pcmcia/cs.c
@@
-26,7
+26,6
@@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/pm.h>
-#include <linux/pci.h>
#include <linux/device.h>
#include <linux/kthread.h>
#include <linux/freezer.h>