From c7c8dd5ac5e099a7a077069a3bffa4872e927350 Mon Sep 17 00:00:00 2001 From: Martin Langer Date: Mon, 5 Feb 2007 13:02:35 +0100 Subject: [PATCH] --- yaml --- r: 47229 b: refs/heads/master c: 66e27788a33636cf0d9bf22eb9d56a7f4ffa3a84 h: refs/heads/master i: 47227: 168c7cbfb0532787ff03d0ac9e3a058d6a481f55 v: v3 --- [refs] | 2 +- trunk/sound/ac97_bus.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc0a5da5738b..4cbe343e3353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0b0fac14edf81dc62615cd757e7c73d2059152c +refs/heads/master: 66e27788a33636cf0d9bf22eb9d56a7f4ffa3a84 diff --git a/trunk/sound/ac97_bus.c b/trunk/sound/ac97_bus.c index 66de2c2f1554..7fa37e15f196 100644 --- a/trunk/sound/ac97_bus.c +++ b/trunk/sound/ac97_bus.c @@ -26,6 +26,7 @@ static int ac97_bus_match(struct device *dev, struct device_driver *drv) return 1; } +#ifdef CONFIG_PM static int ac97_bus_suspend(struct device *dev, pm_message_t state) { int ret = 0; @@ -45,12 +46,15 @@ static int ac97_bus_resume(struct device *dev) return ret; } +#endif /* CONFIG_PM */ struct bus_type ac97_bus_type = { .name = "ac97", .match = ac97_bus_match, +#ifdef CONFIG_PM .suspend = ac97_bus_suspend, .resume = ac97_bus_resume, +#endif /* CONFIG_PM */ }; static int __init ac97_bus_init(void)