Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31761
b: refs/heads/master
c: 5863aa6
h: refs/heads/master
i:
  31759: a27161a
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jul 3, 2006
1 parent 6f8d833 commit 22c3e8d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b8f3ef454d60e0c7ec42400400dc0fe7b5a4f7d
refs/heads/master: 5863aa651bd79a6bb15972894306923db088e71c
4 changes: 2 additions & 2 deletions trunk/sound/sparc/amd7930.c
Original file line number Diff line number Diff line change
Expand Up @@ -1033,10 +1033,10 @@ static int __init amd7930_attach_common(struct resource *rp, int irq)

strcpy(card->driver, "AMD7930");
strcpy(card->shortname, "Sun AMD7930");
sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
sprintf(card->longname, "%s at 0x%02lx:0x%08Lx, irq %d",
card->shortname,
rp->flags & 0xffL,
rp->start,
(unsigned long long)rp->start,
irq);

if ((err = snd_amd7930_create(card, rp,
Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/sparc/cs4231.c
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
if (err)
return err;

sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d",
sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
card->shortname,
rp->flags & 0xffL,
(unsigned long long)rp->start,
Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/sparc/dbri.c
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
strcpy(card->driver, "DBRI");
strcpy(card->shortname, "Sun DBRI");
rp = &sdev->resource[0];
sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d",
sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
card->shortname,
rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri);

Expand Down

0 comments on commit 22c3e8d

Please sign in to comment.