summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-08-12 02:02:02 +0400
committerDave Jones <davej@redhat.com>2006-08-11 18:10:27 -0400
commit85be7d60595b4803731cec158b0023bc050fdd14 (patch)
tree2a3e144f0b5183e0c1e1f976f2ad9a1b7c8481bd
parent71565619af84a15d0abef6f0d6704e6472cd87c1 (diff)
downloadlinux-stable-85be7d60595b4803731cec158b0023bc050fdd14.tar.gz
linux-stable-85be7d60595b4803731cec158b0023bc050fdd14.tar.bz2
linux-stable-85be7d60595b4803731cec158b0023bc050fdd14.zip
[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)
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)