diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /sound/sparc/amd7930.c | |
| parent | [POWERPC] remove kernel module option for booke wdt (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.tar.xz linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.zip | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'sound/sparc/amd7930.c')
| -rw-r--r-- | sound/sparc/amd7930.c | 4 |
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; |