diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-11-02 17:08:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 08:19:11 +0100 |
| commit | 45c1de8e20cec40b6846def0aeca09cb1bfb839b (patch) | |
| tree | 6a994668f7258422de9cbfd1fb80ebaf0bd21c61 /sound/pci/Kconfig | |
| parent | e6d06e085bb5e7769c91bd14eb46094034fff8e6 (diff) | |
| download | kernel-common-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.gz kernel-common-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.bz2 kernel-common-45c1de8e20cec40b6846def0aeca09cb1bfb839b.zip | |
ALSA: oxygen: merge HiFier driver into snd-oxygen
The snd-hifier driver contains more duplicated code than model-specific
code, so it does not make sense for it to be a separate driver.
Handling the two-channel output restriction can be easily done in the
generic driver.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/Kconfig')
| -rw-r--r-- | sound/pci/Kconfig | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 12e34653b8a8..dfe406de9935 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -209,7 +209,7 @@ config SND_OXYGEN_LIB tristate config SND_OXYGEN - tristate "C-Media 8788 (Oxygen)" + tristate "C-Media 8787, 8788 (Oxygen)" select SND_OXYGEN_LIB select SND_PCM select SND_MPU401_UART @@ -224,6 +224,7 @@ config SND_OXYGEN * HT-Omega Claro halo (XT) * Razer Barracuda AC-1 * Sondigo Inferno + * TempoTec/MediaTek HiFier Fantasia To compile this driver as a module, choose M here: the module will be called snd-oxygen. @@ -578,18 +579,6 @@ config SND_HDSPM To compile this driver as a module, choose M here: the module will be called snd-hdspm. -config SND_HIFIER - tristate "TempoTec HiFier Fantasia" - select SND_OXYGEN_LIB - select SND_PCM - select SND_MPU401_UART - help - Say Y here to include support for the MediaTek/TempoTec HiFier - Fantasia sound card. - - To compile this driver as a module, choose M here: the module - will be called snd-hifier. - config SND_ICE1712 tristate "ICEnsemble ICE1712 (Envy24)" select SND_MPU401_UART |