diff options
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.c')
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index db79ca61cf96..59866905ea37 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <pcmcia/ss.h> | 17 | #include <pcmcia/ss.h> |
| 17 | 18 | ||
| @@ -213,16 +214,6 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev) | |||
| 213 | return 0; | 214 | return 0; |
| 214 | } | 215 | } |
| 215 | 216 | ||
| 216 | static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state) | ||
| 217 | { | ||
| 218 | return pcmcia_socket_dev_suspend(&dev->dev); | ||
| 219 | } | ||
| 220 | |||
| 221 | static int pcmcia_resume(struct sa1111_dev *dev) | ||
| 222 | { | ||
| 223 | return pcmcia_socket_dev_resume(&dev->dev); | ||
| 224 | } | ||
| 225 | |||
| 226 | static struct sa1111_driver pcmcia_driver = { | 217 | static struct sa1111_driver pcmcia_driver = { |
| 227 | .drv = { | 218 | .drv = { |
| 228 | .name = "sa1111-pcmcia", | 219 | .name = "sa1111-pcmcia", |
| @@ -230,8 +221,6 @@ static struct sa1111_driver pcmcia_driver = { | |||
| 230 | .devid = SA1111_DEVID_PCMCIA, | 221 | .devid = SA1111_DEVID_PCMCIA, |
| 231 | .probe = pcmcia_probe, | 222 | .probe = pcmcia_probe, |
| 232 | .remove = __devexit_p(pcmcia_remove), | 223 | .remove = __devexit_p(pcmcia_remove), |
| 233 | .suspend = pcmcia_suspend, | ||
| 234 | .resume = pcmcia_resume, | ||
| 235 | }; | 224 | }; |
| 236 | 225 | ||
| 237 | static int __init sa1111_drv_pcmcia_init(void) | 226 | static int __init sa1111_drv_pcmcia_init(void) |
