projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-9627 into release branch
[powerpc.git]
/
sound
/
ac97_bus.c
diff --git
a/sound/ac97_bus.c
b/sound/ac97_bus.c
index
66de2c2
..
7fa37e1
100644
(file)
--- a/
sound/ac97_bus.c
+++ b/
sound/ac97_bus.c
@@
-26,6
+26,7
@@
static int ac97_bus_match(struct device *dev, struct device_driver *drv)
return 1;
}
return 1;
}
+#ifdef CONFIG_PM
static int ac97_bus_suspend(struct device *dev, pm_message_t state)
{
int ret = 0;
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;
}
return ret;
}
+#endif /* CONFIG_PM */
struct bus_type ac97_bus_type = {
.name = "ac97",
.match = ac97_bus_match,
struct bus_type ac97_bus_type = {
.name = "ac97",
.match = ac97_bus_match,
+#ifdef CONFIG_PM
.suspend = ac97_bus_suspend,
.resume = ac97_bus_resume,
.suspend = ac97_bus_suspend,
.resume = ac97_bus_resume,
+#endif /* CONFIG_PM */
};
static int __init ac97_bus_init(void)
};
static int __init ac97_bus_init(void)