projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pata_hpt3x3: suspend/resume support
[powerpc.git]
/
sound
/
sparc
/
cs4231.c
diff --git
a/sound/sparc/cs4231.c
b/sound/sparc/cs4231.c
index
44ad961
..
edeb3d3
100644
(file)
--- a/
sound/sparc/cs4231.c
+++ b/
sound/sparc/cs4231.c
@@
-1753,7
+1753,7
@@
out_err:
#ifdef SBUS_SUPPORT
#ifdef SBUS_SUPPORT
-static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id)
{
unsigned long flags;
unsigned char status;
{
unsigned long flags;
unsigned char status;
@@
-2001,7
+2001,7
@@
static int __init snd_cs4231_sbus_create(struct snd_card *card,
chip->c_dma.preallocate = sbus_dma_preallocate;
if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
chip->c_dma.preallocate = sbus_dma_preallocate;
if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
-
SA_SHIRQ
, "cs4231", chip)) {
+
IRQF_SHARED
, "cs4231", chip)) {
snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
dev, sdev->irqs[0]);
snd_cs4231_sbus_free(chip);
snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
dev, sdev->irqs[0]);
snd_cs4231_sbus_free(chip);
@@
-2036,7
+2036,7
@@
static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
if (err)
return err;
if (err)
return err;
- sprintf(card->longname, "%s at 0x%02lx:0x%016
l
x, irq %d",
+ sprintf(card->longname, "%s at 0x%02lx:0x%016
L
x, irq %d",
card->shortname,
rp->flags & 0xffL,
(unsigned long long)rp->start,
card->shortname,
rp->flags & 0xffL,
(unsigned long long)rp->start,