diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-10-20 17:44:13 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-10-25 21:59:41 -0400 |
commit | f237de58b13bf65ba2f7fab896daacb92ae7ddef (patch) | |
tree | 48eb73b27fa5938079c048a7dca0b791dce7f8bd /drivers/pcmcia/yenta_socket.c | |
parent | ace7d4772cf056d9b13b51bd496a8be968774592 (diff) |
[PATCH] CONFIG_PM=n slim: drivers/pcmcia/*
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 26229d9da76..9ced52ab7d1 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 | ||