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/cs.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/cs.c')
| -rw-r--r-- | drivers/pcmcia/cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 2ec8ac97445c..d9ea192c4001 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 34 | 34 | ||
| 35 | #include <pcmcia/ss.h> | 35 | #include <pcmcia/ss.h> |
| 36 | #include <pcmcia/cs.h> | ||
| 37 | #include <pcmcia/cistpl.h> | 36 | #include <pcmcia/cistpl.h> |
| 38 | #include <pcmcia/cisreg.h> | 37 | #include <pcmcia/cisreg.h> |
| 39 | #include <pcmcia/ds.h> | 38 | #include <pcmcia/ds.h> |
| @@ -845,7 +844,7 @@ static int pcmcia_socket_dev_resume_noirq(struct device *dev) | |||
| 845 | return __pcmcia_pm_op(dev, socket_early_resume); | 844 | return __pcmcia_pm_op(dev, socket_early_resume); |
| 846 | } | 845 | } |
| 847 | 846 | ||
| 848 | static int pcmcia_socket_dev_resume(struct device *dev) | 847 | static int __used pcmcia_socket_dev_resume(struct device *dev) |
| 849 | { | 848 | { |
| 850 | return __pcmcia_pm_op(dev, socket_late_resume); | 849 | return __pcmcia_pm_op(dev, socket_late_resume); |
| 851 | } | 850 | } |