diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-10-20 14:44:13 -0700 |
|---|---|---|
| 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) | |
| download | op-kernel-dev-f237de58b13bf65ba2f7fab896daacb92ae7ddef.zip op-kernel-dev-f237de58b13bf65ba2f7fab896daacb92ae7ddef.tar.gz | |
[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 26229d9..9ced52a 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 return ret; } - +#ifdef CONFIG_PM static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) { struct yenta_socket *socket = pci_get_drvdata(dev); @@ -1262,7 +1262,7 @@ static int yenta_dev_resume (struct pci_dev *dev) return pcmcia_socket_dev_resume(&dev->dev); } - +#endif #define CB_ID(vend,dev,type) \ { \ @@ -1359,8 +1359,10 @@ static struct pci_driver yenta_cardbus_driver = { .id_table = yenta_table, .probe = yenta_probe, .remove = __devexit_p(yenta_close), +#ifdef CONFIG_PM .suspend = yenta_dev_suspend, .resume = yenta_dev_resume, +#endif }; |
