Merge branch 'for-2.6.33' into for-2.6.34

[linux-drm-fsl-dcu.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9b36c5eec75cde28bf4d7fd413eb5fc8881030c2..9085b40fa04b412e2cc7b4a9fdc61fe8a95a193d 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1236,7 +1236,7 @@ static int soc_poweroff(struct device *dev)
        return 0;
 }
 
-static struct dev_pm_ops soc_pm_ops = {
+static const struct dev_pm_ops soc_pm_ops = {
        .suspend = soc_suspend,
        .resume = soc_resume,
        .poweroff = soc_poweroff,