Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

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

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index c899786f30f5fb5584595889123f954e9045b51d..07962a35f2412f8461681835fcf6c12b7244bfc3 100644 (file)
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1067,8 +1067,8 @@ out_err:
 
 static int __devinit amd7930_obio_attach(struct device_node *dp)
 {
-       struct linux_prom_registers *regs;
-       struct linux_prom_irqs *irqp;
+       const struct linux_prom_registers *regs;
+       const struct linux_prom_irqs *irqp;
        struct resource res, *rp;
        int len;