aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-08-11 18:02:02 -0400
committerDave Jones <davej@redhat.com>2006-08-11 18:10:27 -0400
commit85be7d60595b4803731cec158b0023bc050fdd14 (patch)
tree2a3e144f0b5183e0c1e1f976f2ad9a1b7c8481bd
parent71565619af84a15d0abef6f0d6704e6472cd87c1 (diff)
[AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--drivers/char/agp/intel-agp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 61ac3809f997..42a1cb871992 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1766,6 +1766,7 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
1766 agp_put_bridge(bridge); 1766 agp_put_bridge(bridge);
1767} 1767}
1768 1768
1769#ifdef CONFIG_PM
1769static int agp_intel_resume(struct pci_dev *pdev) 1770static int agp_intel_resume(struct pci_dev *pdev)
1770{ 1771{
1771 struct agp_bridge_data *bridge = pci_get_drvdata(pdev); 1772 struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
@@ -1789,6 +1790,7 @@ static int agp_intel_resume(struct pci_dev *pdev)
1789 1790
1790 return 0; 1791 return 0;
1791} 1792}
1793#endif
1792 1794
1793static struct pci_device_id agp_intel_pci_table[] = { 1795static struct pci_device_id agp_intel_pci_table[] = {
1794#define ID(x) \ 1796#define ID(x) \
@@ -1835,7 +1837,9 @@ static struct pci_driver agp_intel_pci_driver = {
1835 .id_table = agp_intel_pci_table, 1837 .id_table = agp_intel_pci_table,
1836 .probe = agp_intel_probe, 1838 .probe = agp_intel_probe,
1837 .remove = __devexit_p(agp_intel_remove), 1839 .remove = __devexit_p(agp_intel_remove),
1840#ifdef CONFIG_PM
1838 .resume = agp_intel_resume, 1841 .resume = agp_intel_resume,
1842#endif
1839}; 1843};
1840 1844
1841static int __init agp_intel_init(void) 1845static int __init agp_intel_init(void)