diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/pcmcia/rsrc_iodyn.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/pcmcia/rsrc_iodyn.c')
| -rw-r--r-- | drivers/pcmcia/rsrc_iodyn.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c index 8510c35d2952..523eb691c30b 100644 --- a/drivers/pcmcia/rsrc_iodyn.c +++ b/drivers/pcmcia/rsrc_iodyn.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | 18 | ||
| 19 | #include <pcmcia/ss.h> | 19 | #include <pcmcia/ss.h> |
| 20 | #include <pcmcia/cs.h> | ||
| 21 | #include <pcmcia/cistpl.h> | 20 | #include <pcmcia/cistpl.h> |
| 22 | #include "cs_internal.h" | 21 | #include "cs_internal.h" |
| 23 | 22 | ||