From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 11 Aug 2006 22:02:02 +0000 (+0400)
Subject: [AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
X-Git-Tag: v2.6.19-rc1~1282^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=85be7d60595b4803731cec158b0023bc050fdd14;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 61ac3809f99..42a1cb87199 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)
 	agp_put_bridge(bridge);
 }
 
+#ifdef CONFIG_PM
 static int agp_intel_resume(struct pci_dev *pdev)
 {
 	struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
@@ -1789,6 +1790,7 @@ static int agp_intel_resume(struct pci_dev *pdev)
 
 	return 0;
 }
+#endif
 
 static struct pci_device_id agp_intel_pci_table[] = {
 #define ID(x)						\
@@ -1835,7 +1837,9 @@ static struct pci_driver agp_intel_pci_driver = {
 	.id_table	= agp_intel_pci_table,
 	.probe		= agp_intel_probe,
 	.remove		= __devexit_p(agp_intel_remove),
+#ifdef CONFIG_PM
 	.resume		= agp_intel_resume,
+#endif
 };
 
 static int __init agp_intel_init(void)