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 'next' into for-linus
[linux-2.6-block.git]
/
drivers
/
pcmcia
/
cardbus.c
diff --git
a/drivers/pcmcia/cardbus.c
b/drivers/pcmcia/cardbus.c
index fb2f38dc92c560de378ddab5b688657e82d8661a..911ca0e8dfc29b94498fec85b10c73cb33be7aef 100644
(file)
--- a/
drivers/pcmcia/cardbus.c
+++ b/
drivers/pcmcia/cardbus.c
@@
-30,11
+30,9
@@
#include <asm/irq.h>
#include <asm/io.h>
-#define IN_CARD_SERVICES
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"