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 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
pcmcia
/
au1000_generic.h
diff --git
a/drivers/pcmcia/au1000_generic.h
b/drivers/pcmcia/au1000_generic.h
index
c62437d
..
a53ef59
100644
(file)
--- a/
drivers/pcmcia/au1000_generic.h
+++ b/
drivers/pcmcia/au1000_generic.h
@@
-26,7
+26,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"