diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:45:18 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:45:18 +0200 |
commit | 775b2449bdba7c97dda9f274c92bf7a83dac4142 (patch) | |
tree | b4bee45c13762ea93642b1e38c62de454e51cf5d /sound/pci | |
parent | 21363cf0ca5c9c62e34e37422fb1d13d70d3de3c (diff) | |
parent | 5fb86e5d4a951ddb0474cdfd809380c8e2a8d101 (diff) | |
download | linux-3.10-775b2449bdba7c97dda9f274c92bf7a83dac4142.tar.gz linux-3.10-775b2449bdba7c97dda9f274c92bf7a83dac4142.tar.bz2 linux-3.10-775b2449bdba7c97dda9f274c92bf7a83dac4142.zip |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 88168044375..5ca0939e422 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -2,8 +2,8 @@ config SND_TEA575X tristate - depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 - default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 + depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO + default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO menuconfig SND_PCI bool "PCI sound devices" |