diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /drivers/pcmcia/au1000_pb1x00.c | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 157e41423a0..aa1cd4d3aa2 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" |