diff options
-rw-r--r-- | drivers/pcmcia/i82092.c | 4 | ||||
-rw-r--r-- | drivers/pcmcia/pd6729.c | 4 | ||||
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 82715f448957..d316d956f3b1 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c | |||
@@ -41,6 +41,7 @@ static struct pci_device_id i82092aa_pci_ids[] = { | |||
41 | }; | 41 | }; |
42 | MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids); | 42 | MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids); |
43 | 43 | ||
44 | #ifdef CONFIG_PM | ||
44 | static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state) | 45 | static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state) |
45 | { | 46 | { |
46 | return pcmcia_socket_dev_suspend(&dev->dev, state); | 47 | return pcmcia_socket_dev_suspend(&dev->dev, state); |
@@ -50,14 +51,17 @@ static int i82092aa_socket_resume (struct pci_dev *dev) | |||
50 | { | 51 | { |
51 | return pcmcia_socket_dev_resume(&dev->dev); | 52 | return pcmcia_socket_dev_resume(&dev->dev); |
52 | } | 53 | } |
54 | #endif | ||
53 | 55 | ||
54 | static struct pci_driver i82092aa_pci_drv = { | 56 | static struct pci_driver i82092aa_pci_drv = { |
55 | .name = "i82092aa", | 57 | .name = "i82092aa", |
56 | .id_table = i82092aa_pci_ids, | 58 | .id_table = i82092aa_pci_ids, |
57 | .probe = i82092aa_pci_probe, | 59 | .probe = i82092aa_pci_probe, |
58 | .remove = __devexit_p(i82092aa_pci_remove), | 60 | .remove = __devexit_p(i82092aa_pci_remove), |
61 | #ifdef CONFIG_PM | ||
59 | .suspend = i82092aa_socket_suspend, | 62 | .suspend = i82092aa_socket_suspend, |
60 | .resume = i82092aa_socket_resume, | 63 | .resume = i82092aa_socket_resume, |
64 | #endif | ||
61 | }; | 65 | }; |
62 | 66 | ||
63 | 67 | ||
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index c83a0a6b158f..a70f97fdbbdd 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
@@ -755,6 +755,7 @@ static void __devexit pd6729_pci_remove(struct pci_dev *dev) | |||
755 | kfree(socket); | 755 | kfree(socket); |
756 | } | 756 | } |
757 | 757 | ||
758 | #ifdef CONFIG_PM | ||
758 | static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state) | 759 | static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state) |
759 | { | 760 | { |
760 | return pcmcia_socket_dev_suspend(&dev->dev, state); | 761 | return pcmcia_socket_dev_suspend(&dev->dev, state); |
@@ -764,6 +765,7 @@ static int pd6729_socket_resume(struct pci_dev *dev) | |||
764 | { | 765 | { |
765 | return pcmcia_socket_dev_resume(&dev->dev); | 766 | return pcmcia_socket_dev_resume(&dev->dev); |
766 | } | 767 | } |
768 | #endif | ||
767 | 769 | ||
768 | static struct pci_device_id pd6729_pci_ids[] = { | 770 | static struct pci_device_id pd6729_pci_ids[] = { |
769 | { | 771 | { |
@@ -781,8 +783,10 @@ static struct pci_driver pd6729_pci_drv = { | |||
781 | .id_table = pd6729_pci_ids, | 783 | .id_table = pd6729_pci_ids, |
782 | .probe = pd6729_pci_probe, | 784 | .probe = pd6729_pci_probe, |
783 | .remove = __devexit_p(pd6729_pci_remove), | 785 | .remove = __devexit_p(pd6729_pci_remove), |
786 | #ifdef CONFIG_PM | ||
784 | .suspend = pd6729_socket_suspend, | 787 | .suspend = pd6729_socket_suspend, |
785 | .resume = pd6729_socket_resume, | 788 | .resume = pd6729_socket_resume, |
789 | #endif | ||
786 | }; | 790 | }; |
787 | 791 | ||
788 | static int pd6729_module_init(void) | 792 | static int pd6729_module_init(void) |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 26229d9da762..9ced52ab7d14 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -1213,7 +1213,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i | |||
1213 | return ret; | 1213 | return ret; |
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | 1216 | #ifdef CONFIG_PM | |
1217 | static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) | 1217 | static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) |
1218 | { | 1218 | { |
1219 | struct yenta_socket *socket = pci_get_drvdata(dev); | 1219 | struct yenta_socket *socket = pci_get_drvdata(dev); |
@@ -1262,7 +1262,7 @@ static int yenta_dev_resume (struct pci_dev *dev) | |||
1262 | 1262 | ||
1263 | return pcmcia_socket_dev_resume(&dev->dev); | 1263 | return pcmcia_socket_dev_resume(&dev->dev); |
1264 | } | 1264 | } |
1265 | 1265 | #endif | |
1266 | 1266 | ||
1267 | #define CB_ID(vend,dev,type) \ | 1267 | #define CB_ID(vend,dev,type) \ |
1268 | { \ | 1268 | { \ |
@@ -1359,8 +1359,10 @@ static struct pci_driver yenta_cardbus_driver = { | |||
1359 | .id_table = yenta_table, | 1359 | .id_table = yenta_table, |
1360 | .probe = yenta_probe, | 1360 | .probe = yenta_probe, |
1361 | .remove = __devexit_p(yenta_close), | 1361 | .remove = __devexit_p(yenta_close), |
1362 | #ifdef CONFIG_PM | ||
1362 | .suspend = yenta_dev_suspend, | 1363 | .suspend = yenta_dev_suspend, |
1363 | .resume = yenta_dev_resume, | 1364 | .resume = yenta_dev_resume, |
1365 | #endif | ||
1364 | }; | 1366 | }; |
1365 | 1367 | ||
1366 | 1368 | ||