2006-08-11 21:59:53

by Alexey Dobriyan

Subject: [PATCH] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c

Signed-off-by: Alexey Dobriyan <[email protected]>
---

drivers/char/agp/efficeon-agp.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -337,13 +337,6 @@ static struct agp_bridge_driver efficeon
.agp_destroy_page = agp_generic_destroy_page,
};

-
-static int agp_efficeon_resume(struct pci_dev *pdev)
-{
- printk(KERN_DEBUG PFX "agp_efficeon_resume()\n");
- return efficeon_configure();
-}
-
static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
@@ -414,11 +407,18 @@ static void __devexit agp_efficeon_remov
agp_put_bridge(bridge);
}

+#ifdef CONFIG_PM
static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)
{
return 0;
}

+static int agp_efficeon_resume(struct pci_dev *pdev)
+{
+ printk(KERN_DEBUG PFX "agp_efficeon_resume()\n");
+ return efficeon_configure();
+}
+#endif

static struct pci_device_id agp_efficeon_pci_table[] = {
{
@@ -439,8 +439,10 @@ static struct pci_driver agp_efficeon_pc
.id_table = agp_efficeon_pci_table,
.probe = agp_efficeon_probe,
.remove = agp_efficeon_remove,
+#ifdef CONFIG_PM
.suspend = agp_efficeon_suspend,
.resume = agp_efficeon_resume,
+#endif
};

static int __init agp_efficeon_init(void)

2006-08-11 22:11:19

by Dave Jones

Subject: Re: [PATCH] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c

On Sat, Aug 12, 2006 at 01:59:50AM +0400, Alexey Dobriyan wrote:
> Signed-off-by: Alexey Dobriyan <[email protected]>
> ---
>
> drivers/char/agp/efficeon-agp.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)

Applied to agpgart-git, thanks.

Dave

--
http://www.codemonkey.org.uk