diff options
author | Alan Horstmann <gineera@aspect135.co.uk> | 2006-05-26 11:19:34 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:34:02 -0400 |
commit | cf78ee2ccc96d59e602188e0e6e3fe3522b6d3f6 (patch) | |
tree | 027aff68ac7c21c27c86ba99b43a8f2b112f79e0 /sound/pci/ice1712/ice1712.h | |
parent | 766a6c36f3a0b12e1c55dddc1df6673db6b22bfb (diff) |
[ALSA] ice1712 - Set mpu401 info flags from _card_info
To permit use, in ice1712, of the mpu401 info flags recently added to
mpu401_uart, adds info_flags in snd_ice1712_card_info so that additional
flags can be set, if desired. 'MPU401_INFO_INTEGRATED' is always set with
the ice1712. The flags are passed on to snd_mpu401_uart_new().
_INFO_OUTPUT is set for DMX6fire mpu2.
Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/ice1712.h')
-rw-r--r-- | sound/pci/ice1712/ice1712.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index d4776319a0cd..ce27eac40d4e 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <sound/ak4xxx-adda.h> | 29 | #include <sound/ak4xxx-adda.h> |
30 | #include <sound/ak4114.h> | 30 | #include <sound/ak4114.h> |
31 | #include <sound/pcm.h> | 31 | #include <sound/pcm.h> |
32 | #include <sound/mpu401.h> | ||
32 | 33 | ||
33 | 34 | ||
34 | /* | 35 | /* |
@@ -495,6 +496,8 @@ struct snd_ice1712_card_info { | |||
495 | int (*chip_init)(struct snd_ice1712 *); | 496 | int (*chip_init)(struct snd_ice1712 *); |
496 | int (*build_controls)(struct snd_ice1712 *); | 497 | int (*build_controls)(struct snd_ice1712 *); |
497 | unsigned int no_mpu401: 1; | 498 | unsigned int no_mpu401: 1; |
499 | unsigned int mpu401_1_info_flags; | ||
500 | unsigned int mpu401_2_info_flags; | ||
498 | const char *mpu401_1_name; | 501 | const char *mpu401_1_name; |
499 | const char *mpu401_2_name; | 502 | const char *mpu401_2_name; |
500 | unsigned int eeprom_size; | 503 | unsigned int eeprom_size; |