diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
| commit | 9e42d0cf5020aaf217433cad1a224745241d212a (patch) | |
| tree | 8d64537c600024a4220d1309873ac3467726c3b0 /sound | |
| parent | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff) | |
| parent | 18b8e08e290e9df588f51f5a7df50555f5a25664 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Work around branch tracer warning.
sparc64: Fix unsigned long long warnings in drivers.
sparc64: Use unsigned long long for u64.
sparc: refactor code in fault_32.c
sparc64: refactor code in init_64.c
sparc64: refactor code in viohs.c
sparc: make proces_ver_nack a bit more readable
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/sparc/cs4231.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index d44bf98e965e..41c387587474 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -2057,7 +2057,7 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev | |||
| 2057 | if (err) | 2057 | if (err) |
| 2058 | return err; | 2058 | return err; |
| 2059 | 2059 | ||
| 2060 | sprintf(card->longname, "%s at 0x%lx, irq %d", | 2060 | sprintf(card->longname, "%s at 0x%llx, irq %d", |
| 2061 | card->shortname, | 2061 | card->shortname, |
| 2062 | op->resource[0].start, | 2062 | op->resource[0].start, |
| 2063 | op->irqs[0]); | 2063 | op->irqs[0]); |