Merge branch 'merge'
[linux-2.6.git] / sound / aoa / core / snd-aoa-gpio-feature.c
index f69d333..7c26089 100644 (file)
@@ -56,7 +56,7 @@ static struct device_node *get_gpio(char *name,
 {
        struct device_node *np, *gpio;
        u32 *reg;
-       char *audio_gpio;
+       const char *audio_gpio;
 
        *gpioptr = -1;