diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index aa5a41fecb08..845907159b74 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -61,7 +61,6 @@ | |||
61 | #include <sound/core.h> | 61 | #include <sound/core.h> |
62 | #include <sound/cs8427.h> | 62 | #include <sound/cs8427.h> |
63 | #include <sound/info.h> | 63 | #include <sound/info.h> |
64 | #include <sound/mpu401.h> | ||
65 | #include <sound/initval.h> | 64 | #include <sound/initval.h> |
66 | 65 | ||
67 | #include <sound/asoundef.h> | 66 | #include <sound/asoundef.h> |
@@ -2739,7 +2738,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2739 | if (! c->no_mpu401) { | 2738 | if (! c->no_mpu401) { |
2740 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, | 2739 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, |
2741 | ICEREG(ice, MPU1_CTRL), | 2740 | ICEREG(ice, MPU1_CTRL), |
2742 | MPU401_INFO_INTEGRATED, | 2741 | (c->mpu401_1_info_flags | |
2742 | MPU401_INFO_INTEGRATED), | ||
2743 | ice->irq, 0, | 2743 | ice->irq, 0, |
2744 | &ice->rmidi[0])) < 0) { | 2744 | &ice->rmidi[0])) < 0) { |
2745 | snd_card_free(card); | 2745 | snd_card_free(card); |
@@ -2755,7 +2755,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2755 | /* 2nd port used */ | 2755 | /* 2nd port used */ |
2756 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, | 2756 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, |
2757 | ICEREG(ice, MPU2_CTRL), | 2757 | ICEREG(ice, MPU2_CTRL), |
2758 | MPU401_INFO_INTEGRATED, | 2758 | (c->mpu401_2_info_flags | |
2759 | MPU401_INFO_INTEGRATED), | ||
2759 | ice->irq, 0, | 2760 | ice->irq, 0, |
2760 | &ice->rmidi[1])) < 0) { | 2761 | &ice->rmidi[1])) < 0) { |
2761 | snd_card_free(card); | 2762 | snd_card_free(card); |