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.alsa-project.org/alsa-kernel
[pandora-kernel.git]
/
drivers
/
pcmcia
/
soc_common.h
diff --git
a/drivers/pcmcia/soc_common.h
b/drivers/pcmcia/soc_common.h
index
1edc1da
..
91ef6a0
100644
(file)
--- a/
drivers/pcmcia/soc_common.h
+++ b/
drivers/pcmcia/soc_common.h
@@
-14,7
+14,6
@@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"