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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[pandora-kernel.git]
/
drivers
/
pcmcia
/
socket_sysfs.c
diff --git
a/drivers/pcmcia/socket_sysfs.c
b/drivers/pcmcia/socket_sysfs.c
index
80e36bc
..
cb0d3ac
100644
(file)
--- a/
drivers/pcmcia/socket_sysfs.c
+++ b/
drivers/pcmcia/socket_sysfs.c
@@
-26,7
+26,6
@@
#include <asm/system.h>
#include <asm/irq.h>
-#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/cistpl.h>