git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
pcmcia
/
cs.c
diff --git
a/drivers/pcmcia/cs.c
b/drivers/pcmcia/cs.c
index
ac00424
..
50cad3a
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>