diff options
-rw-r--r-- | sound/pci/Kconfig | 4 | ||||
-rw-r--r-- | sound/pci/fm801.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index f9f533fccccf..ef41825a7b10 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -560,8 +560,8 @@ config SND_FM801_TEA575X_BOOL | |||
560 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 | 560 | depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 |
561 | help | 561 | help |
562 | Say Y here to include support for soundcards based on the ForteMedia | 562 | Say Y here to include support for soundcards based on the ForteMedia |
563 | FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media | 563 | FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and |
564 | Forte SF256-PCS-02) into the snd-fm801 driver. | 564 | SF64-PCR) into the snd-fm801 driver. |
565 | 565 | ||
566 | config SND_TEA575X | 566 | config SND_TEA575X |
567 | tristate | 567 | tristate |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 05553da2f6cf..eacd4901a308 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -38,7 +38,6 @@ | |||
38 | 38 | ||
39 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL | 39 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
40 | #include <sound/tea575x-tuner.h> | 40 | #include <sound/tea575x-tuner.h> |
41 | #define TEA575X_RADIO 1 | ||
42 | #endif | 41 | #endif |
43 | 42 | ||
44 | MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); | 43 | MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); |
@@ -196,7 +195,7 @@ struct fm801 { | |||
196 | spinlock_t reg_lock; | 195 | spinlock_t reg_lock; |
197 | struct snd_info_entry *proc_entry; | 196 | struct snd_info_entry *proc_entry; |
198 | 197 | ||
199 | #ifdef TEA575X_RADIO | 198 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
200 | struct snd_tea575x tea; | 199 | struct snd_tea575x tea; |
201 | #endif | 200 | #endif |
202 | 201 | ||
@@ -715,7 +714,7 @@ static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pc | |||
715 | * TEA5757 radio | 714 | * TEA5757 radio |
716 | */ | 715 | */ |
717 | 716 | ||
718 | #ifdef TEA575X_RADIO | 717 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
719 | 718 | ||
720 | /* GPIO to TEA575x maps */ | 719 | /* GPIO to TEA575x maps */ |
721 | struct snd_fm801_tea575x_gpio { | 720 | struct snd_fm801_tea575x_gpio { |
@@ -1150,7 +1149,7 @@ static int snd_fm801_free(struct fm801 *chip) | |||
1150 | outw(cmdw, FM801_REG(chip, IRQ_MASK)); | 1149 | outw(cmdw, FM801_REG(chip, IRQ_MASK)); |
1151 | 1150 | ||
1152 | __end_hw: | 1151 | __end_hw: |
1153 | #ifdef TEA575X_RADIO | 1152 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
1154 | snd_tea575x_exit(&chip->tea); | 1153 | snd_tea575x_exit(&chip->tea); |
1155 | #endif | 1154 | #endif |
1156 | if (chip->irq >= 0) | 1155 | if (chip->irq >= 0) |
@@ -1229,7 +1228,7 @@ static int __devinit snd_fm801_create(struct snd_card *card, | |||
1229 | 1228 | ||
1230 | snd_card_set_dev(card, &pci->dev); | 1229 | snd_card_set_dev(card, &pci->dev); |
1231 | 1230 | ||
1232 | #ifdef TEA575X_RADIO | 1231 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
1233 | chip->tea.private_data = chip; | 1232 | chip->tea.private_data = chip; |
1234 | chip->tea.ops = &snd_fm801_tea_ops; | 1233 | chip->tea.ops = &snd_fm801_tea_ops; |
1235 | sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci)); | 1234 | sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci)); |