* [PATCH] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
@ 2006-08-11 22:02 Alexey Dobriyan
2006-08-11 22:11 ` Dave Jones
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Dobriyan @ 2006-08-11 22:02 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
drivers/char/agp/intel-agp.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1766,6 +1766,7 @@ static void __devexit agp_intel_remove(s
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_d
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_d
.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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
2006-08-11 22:02 [PATCH] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c Alexey Dobriyan
@ 2006-08-11 22:11 ` Dave Jones
0 siblings, 0 replies; 2+ messages in thread
From: Dave Jones @ 2006-08-11 22:11 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Andrew Morton, linux-kernel
On Sat, Aug 12, 2006 at 02:02:02AM +0400, Alexey Dobriyan wrote:
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
>
> drivers/char/agp/intel-agp.c | 4 ++++
> 1 file changed, 4 insertions(+)
Applied to agpgart-git, thanks
Dave
--
http://www.codemonkey.org.uk
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-08-11 22:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-11 22:02 [PATCH] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c Alexey Dobriyan
2006-08-11 22:11 ` Dave Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox