diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-04 05:17:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:32 -0400 |
commit | d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 (patch) | |
tree | a48388734053900a8379042757ee241d1e9dfc7b /sound/oss/mpu401.c | |
parent | 595182bcdf64fbfd7ae22c67ea6081b7d387d246 (diff) |
[PATCH] The scheduled removal of some OSS drivers
This patch contains the scheduled removal of OSS drivers that:
- have ALSA drivers for the same hardware without known regressions and
- whose Kconfig options have been removed in 2.6.17.
[michal.k.k.piotrowski@gmail.com: build fix]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/mpu401.c')
-rw-r--r-- | sound/oss/mpu401.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 321f4c4b5a7b..162d07cc489f 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c | |||
@@ -432,16 +432,7 @@ static void mpu401_input_loop(struct mpu_config *devc) | |||
432 | devc->m_busy = 0; | 432 | devc->m_busy = 0; |
433 | } | 433 | } |
434 | 434 | ||
435 | int intchk_mpu401(void *dev_id) | 435 | static irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy) |
436 | { | ||
437 | struct mpu_config *devc; | ||
438 | int dev = (int) dev_id; | ||
439 | |||
440 | devc = &dev_conf[dev]; | ||
441 | return input_avail(devc); | ||
442 | } | ||
443 | |||
444 | irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy) | ||
445 | { | 436 | { |
446 | struct mpu_config *devc; | 437 | struct mpu_config *devc; |
447 | int dev = (int) dev_id; | 438 | int dev = (int) dev_id; |
@@ -1761,8 +1752,6 @@ static int mpu_timer_init(int midi_dev) | |||
1761 | EXPORT_SYMBOL(probe_mpu401); | 1752 | EXPORT_SYMBOL(probe_mpu401); |
1762 | EXPORT_SYMBOL(attach_mpu401); | 1753 | EXPORT_SYMBOL(attach_mpu401); |
1763 | EXPORT_SYMBOL(unload_mpu401); | 1754 | EXPORT_SYMBOL(unload_mpu401); |
1764 | EXPORT_SYMBOL(intchk_mpu401); | ||
1765 | EXPORT_SYMBOL(mpuintr); | ||
1766 | 1755 | ||
1767 | static struct address_info cfg; | 1756 | static struct address_info cfg; |
1768 | 1757 | ||