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-2.6.37' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
drivers
/
pcmcia
/
cistpl.c
diff --git
a/drivers/pcmcia/cistpl.c
b/drivers/pcmcia/cistpl.c
index
91414a0
..
884a984
100644
(file)
--- a/
drivers/pcmcia/cistpl.c
+++ b/
drivers/pcmcia/cistpl.c
@@
-28,7
+28,6
@@
#include <asm/unaligned.h>
#include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
#include <pcmcia/cisreg.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"