diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /sound/sparc/cs4231.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'sound/sparc/cs4231.c')
| -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 5018fcf41df5..9a06c3bd6944 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -2036,7 +2036,7 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev) | |||
| 2036 | if (err) | 2036 | if (err) |
| 2037 | return err; | 2037 | return err; |
| 2038 | 2038 | ||
| 2039 | sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", | 2039 | sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d", |
| 2040 | card->shortname, | 2040 | card->shortname, |
| 2041 | rp->flags & 0xffL, | 2041 | rp->flags & 0xffL, |
| 2042 | (unsigned long long)rp->start, | 2042 | (unsigned long long)rp->start, |