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/trix.c | |
| 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/trix.c')
| -rw-r--r-- | drivers/sound/trix.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/sound/trix.c b/drivers/sound/trix.c index 1c5820fcd..1ed1b8d78 100644 --- a/drivers/sound/trix.c +++ b/drivers/sound/trix.c @@ -23,15 +23,9 @@ #include "sb.h" #include "sound_firmware.h" -#if defined(CONFIG_TRIX) || defined (MODULE) +#ifdef CONFIG_TRIX -#if defined(CONFIG_UART401) || defined(CONFIG_UART401_MODULE) -#if defined(CONFIG_MIDI) -#define DO_MIDI -#endif -#endif - -#ifdef CONFIG_TRIX_HAVE_BOOT +#ifdef INCLUDE_TRIX_BOOT #include "trix_boot.h" #else static unsigned char *trix_boot = NULL; @@ -360,7 +354,7 @@ void attach_trix_mpu(struct address_info *hw_config) int probe_trix_mpu(struct address_info *hw_config) { -#ifdef DO_MIDI +#if defined(CONFIG_UART401) && defined(CONFIG_MIDI) unsigned char conf; static char irq_bits[] = { -1, -1, -1, 1, 2, 3, -1, 4, -1, 5 @@ -443,7 +437,7 @@ void unload_trix_wss(struct address_info *hw_config) void unload_trix_mpu(struct address_info *hw_config) { -#ifdef DO_MIDI +#if defined(CONFIG_UART401) && defined(CONFIG_MIDI) unload_uart401(hw_config); #endif } |