summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 17:23:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 17:23:53 -0800
commit9e42d0cf5020aaf217433cad1a224745241d212a (patch)
tree8d64537c600024a4220d1309873ac3467726c3b0 /sound
parent97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff)
parent18b8e08e290e9df588f51f5a7df50555f5a25664 (diff)
downloadblackbird-obmc-linux-9e42d0cf5020aaf217433cad1a224745241d212a.tar.gz
blackbird-obmc-linux-9e42d0cf5020aaf217433cad1a224745241d212a.zip
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.c2
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
if (err)
return err;
- sprintf(card->longname, "%s at 0x%lx, irq %d",
+ sprintf(card->longname, "%s at 0x%llx, irq %d",
card->shortname,
op->resource[0].start,
op->irqs[0]);
OpenPOWER on IntegriCloud