pandora: defconfig: update

[pandora-kernel.git] / sound / pci / fm801.c

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 136f723..9aeb1c0 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -25,7 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/tlv.h>
@@ -1244,6 +1244,8 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                        return -ENODEV;
                }
        } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) {
+               unsigned int tuner_only = tea575x_tuner & TUNER_ONLY;
+
                /* autodetect tuner connection */
                for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
                        chip->tea575x_tuner = tea575x_tuner;
@@ -1257,6 +1259,8 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                        snd_printk(KERN_ERR "TEA575x radio not found\n");
                        chip->tea575x_tuner = TUNER_DISABLED;
                }
+
+               chip->tea575x_tuner |= tuner_only;
        }
        if (!(chip->tea575x_tuner & TUNER_DISABLED)) {
                strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,