diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/sparc/amd7930.c | 4 | ||||
-rw-r--r-- | sound/sparc/cs4231.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index c899786f30f5..07962a35f241 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
@@ -1067,8 +1067,8 @@ out_err: | |||
1067 | 1067 | ||
1068 | static int __devinit amd7930_obio_attach(struct device_node *dp) | 1068 | static int __devinit amd7930_obio_attach(struct device_node *dp) |
1069 | { | 1069 | { |
1070 | struct linux_prom_registers *regs; | 1070 | const struct linux_prom_registers *regs; |
1071 | struct linux_prom_irqs *irqp; | 1071 | const struct linux_prom_irqs *irqp; |
1072 | struct resource res, *rp; | 1072 | struct resource res, *rp; |
1073 | int len; | 1073 | int len; |
1074 | 1074 | ||
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index f5956d557f70..900a00de35fd 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -2284,7 +2284,7 @@ static int __init cs4231_init(void) | |||
2284 | if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) { | 2284 | if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) { |
2285 | match = 1; | 2285 | match = 1; |
2286 | } else if (!strcmp(edev->prom_node->name, "audio")) { | 2286 | } else if (!strcmp(edev->prom_node->name, "audio")) { |
2287 | char *compat; | 2287 | const char *compat; |
2288 | 2288 | ||
2289 | compat = of_get_property(edev->prom_node, | 2289 | compat = of_get_property(edev->prom_node, |
2290 | "compatible", NULL); | 2290 | "compatible", NULL); |