Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / sbus / char / envctrl.c

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index ea8c35cbffd307a07f9e14139a6e5f540b64c4ac..58e583b61e60cbc809145041df5eb553dec5db13 100644 (file)
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1120,7 +1120,7 @@ static int __devexit envctrl_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id envctrl_match[] = {
+static const struct of_device_id envctrl_match[] = {
        {
                .name = "i2c",
                .compatible = "i2cpcf,8584",