diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /drivers/sound/trident.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'drivers/sound/trident.c')
| -rw-r--r-- | drivers/sound/trident.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sound/trident.c b/drivers/sound/trident.c index bbe991eb2..de01c6cbe 100644 --- a/drivers/sound/trident.c +++ b/drivers/sound/trident.c @@ -79,11 +79,11 @@ #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> +#include <linux/ac97_codec.h> #include <asm/uaccess.h> #include <asm/hardirq.h> #include "trident.h" -#include "ac97_codec.h" #undef DEBUG @@ -1131,7 +1131,7 @@ static void trident_interrupt(int irq, void *dev_id, struct pt_regs *regs) /* Midi - TODO */ } - /* manually clear interrupt status, bad hardware design, balme T^2 */ + /* manually clear interrupt status, bad hardware design, blame T^2 */ outl((ST_TARGET_REACHED | MIXER_OVERFLOW | MIXER_UNDERFLOW), TRID_REG(card, T4D_MISCINT)); spin_unlock(&card->lock); |