Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[sfrench/cifs-2.6.git] / drivers / dma / at_hdmac.c

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index c52ac9efd0bf04547cf7882259daa369a31bf0fb..f15112569c1d686b5a1f6ea9213a7fabd6065f3c 100644 (file)
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1188,7 +1188,7 @@ static int at_dma_resume_noirq(struct device *dev)
        return 0;
 }
 
-static struct dev_pm_ops at_dma_dev_pm_ops = {
+static const struct dev_pm_ops at_dma_dev_pm_ops = {
        .suspend_noirq = at_dma_suspend_noirq,
        .resume_noirq = at_dma_resume_noirq,
 };