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/oxygen/Makefile | |
| parent | e6d06e085bb5e7769c91bd14eb46094034fff8e6 (diff) | |
| download | kernel_samsung_smdk4412-45c1de8e20cec40b6846def0aeca09cb1bfb839b.zip kernel_samsung_smdk4412-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.gz kernel_samsung_smdk4412-45c1de8e20cec40b6846def0aeca09cb1bfb839b.tar.bz2 | |
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/oxygen/Makefile')
| -rw-r--r-- | sound/pci/oxygen/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/oxygen/Makefile b/sound/pci/oxygen/Makefile index acd8f15..bd67c0d 100644 --- a/sound/pci/oxygen/Makefile +++ b/sound/pci/oxygen/Makefile @@ -1,10 +1,8 @@ snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o -snd-hifier-objs := hifier.o snd-oxygen-objs := oxygen.o snd-virtuoso-objs := virtuoso.o xonar_lib.o \ xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o obj-$(CONFIG_SND_OXYGEN_LIB) += snd-oxygen-lib.o -obj-$(CONFIG_SND_HIFIER) += snd-hifier.o obj-$(CONFIG_SND_OXYGEN) += snd-oxygen.o obj-$(CONFIG_SND_VIRTUOSO) += snd-virtuoso.o |