diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-09-25 19:51:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-10-01 12:07:08 -0400 |
commit | 1d5e799663046917a0eb085e716d818af20050b2 (patch) | |
tree | 7e1bef08bf1253cc9f5c973fa380f0d9a8a16439 /drivers | |
parent | 255341c6fded73204b1ee6feb5fe16e125b27f62 (diff) |
[SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c
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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/8250_pci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 851e4839d6d9..4d0ff8f4a01b 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -1789,6 +1789,7 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev) | |||
1789 | pci_disable_device(dev); | 1789 | pci_disable_device(dev); |
1790 | } | 1790 | } |
1791 | 1791 | ||
1792 | #ifdef CONFIG_PM | ||
1792 | static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state) | 1793 | static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state) |
1793 | { | 1794 | { |
1794 | struct serial_private *priv = pci_get_drvdata(dev); | 1795 | struct serial_private *priv = pci_get_drvdata(dev); |
@@ -1818,6 +1819,7 @@ static int pciserial_resume_one(struct pci_dev *dev) | |||
1818 | } | 1819 | } |
1819 | return 0; | 1820 | return 0; |
1820 | } | 1821 | } |
1822 | #endif | ||
1821 | 1823 | ||
1822 | static struct pci_device_id serial_pci_tbl[] = { | 1824 | static struct pci_device_id serial_pci_tbl[] = { |
1823 | { PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960, | 1825 | { PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960, |
@@ -2375,8 +2377,10 @@ static struct pci_driver serial_pci_driver = { | |||
2375 | .name = "serial", | 2377 | .name = "serial", |
2376 | .probe = pciserial_init_one, | 2378 | .probe = pciserial_init_one, |
2377 | .remove = __devexit_p(pciserial_remove_one), | 2379 | .remove = __devexit_p(pciserial_remove_one), |
2380 | #ifdef CONFIG_PM | ||
2378 | .suspend = pciserial_suspend_one, | 2381 | .suspend = pciserial_suspend_one, |
2379 | .resume = pciserial_resume_one, | 2382 | .resume = pciserial_resume_one, |
2383 | #endif | ||
2380 | .id_table = serial_pci_tbl, | 2384 | .id_table = serial_pci_tbl, |
2381 | }; | 2385 | }; |
2382 | 2386 | ||