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/amd7930.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
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 db3e22efd02e..2bd8e40b8541 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
| @@ -1033,10 +1033,10 @@ static int __init amd7930_attach_common(struct resource *rp, int irq) | |||
| 1033 | 1033 | ||
| 1034 | strcpy(card->driver, "AMD7930"); | 1034 | strcpy(card->driver, "AMD7930"); |
| 1035 | strcpy(card->shortname, "Sun AMD7930"); | 1035 | strcpy(card->shortname, "Sun AMD7930"); |
| 1036 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", | 1036 | sprintf(card->longname, "%s at 0x%02lx:0x%08Lx, irq %d", |
| 1037 | card->shortname, | 1037 | card->shortname, |
| 1038 | rp->flags & 0xffL, | 1038 | rp->flags & 0xffL, |
| 1039 | rp->start, | 1039 | (unsigned long long)rp->start, |
| 1040 | irq); | 1040 | irq); |
| 1041 | 1041 | ||
| 1042 | if ((err = snd_amd7930_create(card, rp, | 1042 | if ((err = snd_amd7930_create(card, rp, |