diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /sound/isa | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/gus/gusmax.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/interwave.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index 52498c9d411e..c1c69e3cbfd0 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
@@ -107,7 +107,7 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus) | |||
107 | 107 | ||
108 | static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) | 108 | static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) |
109 | { | 109 | { |
110 | struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id; | 110 | struct snd_gusmax *maxcard = dev_id; |
111 | int loop, max = 5; | 111 | int loop, max = 5; |
112 | int handled = 0; | 112 | int handled = 0; |
113 | 113 | ||
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 5c474b831edc..f12cd09d1fcc 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -301,7 +301,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard, | |||
301 | 301 | ||
302 | static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) | 302 | static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id) |
303 | { | 303 | { |
304 | struct snd_interwave *iwcard = (struct snd_interwave *) dev_id; | 304 | struct snd_interwave *iwcard = dev_id; |
305 | int loop, max = 5; | 305 | int loop, max = 5; |
306 | int handled = 0; | 306 | int handled = 0; |
307 | 307 | ||