diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /drivers/pcmcia/au1000_pb1x00.c | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'drivers/pcmcia/au1000_pb1x00.c')
| -rw-r--r-- | drivers/pcmcia/au1000_pb1x00.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index 157e41423a0a..aa1cd4d3aa29 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <pcmcia/cs_types.h> | 35 | #include <pcmcia/cs_types.h> |
| 36 | #include <pcmcia/cs.h> | 36 | #include <pcmcia/cs.h> |
| 37 | #include <pcmcia/ss.h> | 37 | #include <pcmcia/ss.h> |
| 38 | #include <pcmcia/bulkmem.h> | ||
| 39 | #include <pcmcia/cistpl.h> | 38 | #include <pcmcia/cistpl.h> |
| 40 | #include <pcmcia/bus_ops.h> | 39 | #include <pcmcia/bus_ops.h> |
| 41 | #include "cs_internal.h" | 40 | #include "cs_internal.h" |