diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/sound/sb.h | |
parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/sound/sb.h')
-rw-r--r-- | drivers/sound/sb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sound/sb.h b/drivers/sound/sb.h index 4567d3f5b..8d7ffe1a7 100644 --- a/drivers/sound/sb.h +++ b/drivers/sound/sb.h @@ -1,4 +1,5 @@ #include <linux/config.h> +#include "legacy.h" #ifdef CONFIG_SBDSP #define DSP_RESET (devc->base + 0x6) @@ -112,6 +113,7 @@ typedef struct sb_devc { int input_opened; int midi_broken; void (*midi_input_intr) (int dev, unsigned char data); + void *midi_irq_cookie; /* IRQ cookie for the midi */ } sb_devc; int sb_dsp_command (sb_devc *devc, unsigned char val); @@ -131,4 +133,5 @@ int ess_write (sb_devc *devc, unsigned char reg, unsigned char data); int ess_read (sb_devc *devc, unsigned char reg); extern int acer; +extern sb_devc *last_sb; #endif |