diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
| commit | 25c263542ddf9396012b6a6fa2b327d304f7f9a3 (patch) | |
| tree | d7258f81da125b0bf4a2ce0ede2e79db38a7ed04 /sound | |
| parent | d8581969904b8a72db726c4b9090234c0f0bb18f (diff) | |
| parent | 7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 (diff) | |
| download | kernel-crypto-25c263542ddf9396012b6a6fa2b327d304f7f9a3.tar.gz kernel-crypto-25c263542ddf9396012b6a6fa2b327d304f7f9a3.tar.xz kernel-crypto-25c263542ddf9396012b6a6fa2b327d304f7f9a3.zip | |
Merge branch 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
drivers/char/riscom8: clean up irq handling
isdn/sc: irq handler clean
isdn/act2000: fix major bug. clean irq handler.
char/pcmcia/synclink_cs: trim trailing whitespace
drivers/char/ip2: separate polling and irq-driven work entry points
drivers/char/ip2: split out irq core logic into separate function
[NETDRVR] lib82596, netxen: delete pointless tests from irq handler
Eliminate pointless casts from void* in a few driver irq handlers.
[PARPORT] Remove unused 'irq' argument from parport irq functions
[PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
[PARPORT] Consolidate code copies into a single generic irq handler
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/mts64.c | 2 | ||||
| -rw-r--r-- | sound/drivers/portman2x4.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 911c159bb3d..dcc90f99529 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -830,7 +830,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card) /********************************************************************* * parport stuff *********************************************************************/ -static void snd_mts64_interrupt(int irq, void *private) +static void snd_mts64_interrupt(void *private) { struct mts64 *mts = ((struct snd_card*)private)->private_data; u16 ret; diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 0eb9b5cebfc..e065b2a6444 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -611,7 +611,7 @@ static int __devinit snd_portman_rawmidi_create(struct snd_card *card) /********************************************************************* * parport stuff *********************************************************************/ -static void snd_portman_interrupt(int irq, void *userdata) +static void snd_portman_interrupt(void *userdata) { unsigned char midivalue = 0; struct portman *pm = ((struct snd_card*)userdata)->private_data; |