diff options
author | Eric Miao <eric.miao@linaro.org> | 2011-09-22 19:48:53 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2011-10-18 21:22:32 +0800 |
commit | 2bc0bad7477c992ab744d00bda8c5e22aaea1f42 (patch) | |
tree | 232828a3aa544b8df9011f99f5c05f339ffd40cc | |
parent | fe5af8ed164072a23a8e32c94efe412d0ab9dc18 (diff) |
SAUCE: adjust sgtl5000 and S/PDIF order
BugLink: http://bugs.launchpad.net/bugs/857057
After adding support for S/PDIF audio output routing to HDMI, the
SGTL5000 became card #1, which was no longer #0, thus making it no
longer the default ALSA card.
imx_sgtl5000_init() doesn't need to be late_initcall(), module_init()
works just all right.
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r-- | sound/soc/codecs/Makefile | 4 | ||||
-rw-r--r-- | sound/soc/imx/imx-sgtl5000.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index e39b5548ac4..ae3eea125be 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -24,9 +24,9 @@ snd-soc-l3-objs := l3.o snd-soc-max98088-objs := max98088.o snd-soc-max98095-objs := max98095.o snd-soc-max9850-objs := max9850.o -snd-soc-mxc-spdif-objs := mxc_spdif.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-sgtl5000-objs := sgtl5000.o +snd-soc-mxc-spdif-objs := mxc_spdif.o snd-soc-alc5623-objs := alc5623.o snd-soc-sn95031-objs := sn95031.o snd-soc-spdif-objs := spdif_transciever.o @@ -123,9 +123,9 @@ obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o -obj-$(CONFIG_SND_SOC_MXC_SPDIF) += snd-soc-mxc-spdif.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o +obj-$(CONFIG_SND_SOC_MXC_SPDIF) += snd-soc-mxc-spdif.o obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c index 82ee8eca868..0ff8ee00b3c 100644 --- a/sound/soc/imx/imx-sgtl5000.c +++ b/sound/soc/imx/imx-sgtl5000.c @@ -388,7 +388,7 @@ static void __exit imx_sgtl5000_exit(void) platform_device_unregister(imx_sgtl5000_snd_device); } -late_initcall(imx_sgtl5000_init); +module_init(imx_sgtl5000_init); module_exit(imx_sgtl5000_exit); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); |