Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 2 insertions, 2 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:
 
 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;