Merge branch 'master' into for-next

[linux-2.6-block.git] / drivers / dma / mxs-dma.c

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 829ec686dac337bbad7091db38f5271f73bd0ca9..60de35251da5d3950442a310f82f6311ef50783a 100644 (file)
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -170,7 +170,7 @@ static struct mxs_dma_type mxs_dma_types[] = {
        }
 };
 
-static struct platform_device_id mxs_dma_ids[] = {
+static const struct platform_device_id mxs_dma_ids[] = {
        {
                .name = "imx23-dma-apbh",
                .driver_data = (kernel_ulong_t) &mxs_dma_types[0],