Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / sound / sparc / cs4231.c

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f5956d557f70089f6f9c544df07aacc684876c86..900a00de35fd7b016f0e10b7bbfa9dd2db2a5ae9 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2284,7 +2284,7 @@ static int __init cs4231_init(void)
                        if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
                                match = 1;
                        } else if (!strcmp(edev->prom_node->name, "audio")) {
-                               char *compat;
+                               const char *compat;
 
                                compat = of_get_property(edev->prom_node,
                                                         "compatible", NULL);