projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6-block.git]
/
drivers
/
pcmcia
/
au1000_xxs1500.c
diff --git
a/drivers/pcmcia/au1000_xxs1500.c
b/drivers/pcmcia/au1000_xxs1500.c
index c78ed53475107c7371b503aa68c6d6ff96c6c4e6..8a9b18cee847e980881c1f0536925fca0bbcc52f 100644
(file)
--- a/
drivers/pcmcia/au1000_xxs1500.c
+++ b/
drivers/pcmcia/au1000_xxs1500.c
@@
-39,7
+39,6
@@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/bus_ops.h>
#include "cs_internal.h"