Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux

[safe/jmp/linux-2.6] / sound / ac97_bus.c

diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c
index 66de2c2..a351dd0 100644 (file)
--- a/sound/ac97_bus.c
+++ b/sound/ac97_bus.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/string.h>
+#include <sound/ac97_codec.h>
 
 /*
  * Let drivers decide whether they want to support given codec from their
@@ -26,6 +27,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 +47,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)