[ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag

[people/ms/linux.git] / sound / drivers / mpu401 / mpu401.c

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 67c6e9745418b53748a9d67c21efdf7f603c54cf..23fee622c8fc50bfb0e659dc2991a27e43bf7e30 100644 (file)
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -70,6 +70,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
        struct snd_card *card;
        int err;
 
+       if (!uart_enter[dev])
+               snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
+
        *rcard = NULL;
        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
        if (card == NULL)
@@ -83,8 +86,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
                strcat(card->longname, "polled");
        }
 
-       err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev],
-                                 uart_enter[dev] ? 0 : MPU401_INFO_UART_ONLY,
+       err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,
                                  irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                  NULL);
        if (err < 0) {