diff options
| author | Ben Hutchings <benh@debian.org> | 2014-09-07 19:04:02 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-09-07 19:04:02 +0000 |
| commit | 84a0830f61b43871e84229832c72d890c8612052 (patch) | |
| tree | 28c31ad4e3175753eb7e710c8190a2d7d28c6254 | |
| parent | efd5c3316025e986ea262d53e94673adf3bf6b6d (diff) | |
| download | kernel_replicant_linux-84a0830f61b43871e84229832c72d890c8612052.tar.gz kernel_replicant_linux-84a0830f61b43871e84229832c72d890c8612052.tar.bz2 kernel_replicant_linux-84a0830f61b43871e84229832c72d890c8612052.zip | |
sound: Disable SND_CS5535AUDIO on all but i386 and mips*/loongson-2f
Its config dependencies are now X86_32 || MIPS || COMPILE_TEST.
On MIPS, only Loongson 2F platforms use the CS5536 chip.
svn path=/dists/trunk/linux/; revision=21774
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config/config | 1 | ||||
| -rw-r--r-- | debian/config/kernelarch-mips/config.loongson-2f | 5 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config-arch-32 | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e5183f115d7b..30d3ef9be24c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ linux (3.16.2-1) UNRELEASED; urgency=medium * [m68k] Enable CGROUPS, required by systemd * [armhf] Re-enable SPI_IMX as module * [i386] comedi: Enable COMEDI_DAC02 as module, replacing COMEDI_POC + * sound: Disable SND_CS5535AUDIO on all but i386 and mips*/loongson-2f [ Vagrant Cascadian ] * [armmp] Enable IMX_IPUV3_CORE (closes: #756810). diff --git a/debian/config/config b/debian/config/config index 3750418673bd..cba0c452a152 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5858,7 +5858,6 @@ CONFIG_SND_ALS300=m CONFIG_SND_ASIHPI=m # CONFIG_SND_AW2 is not set CONFIG_SND_OXYGEN=m -CONFIG_SND_CS5535AUDIO=m CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f index 8d7dd1d904ad..c0427b841cce 100644 --- a/debian/config/kernelarch-mips/config.loongson-2f +++ b/debian/config/kernelarch-mips/config.loongson-2f @@ -127,3 +127,8 @@ CONFIG_FB_SIS=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y +## +## file: sound/pci/Kconfig +## +CONFIG_SND_CS5535AUDIO=m + diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 570d75b9ede7..4df6e5235579 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -556,4 +556,5 @@ CONFIG_SND_MSND_CLASSIC=m ## CONFIG_SND_SIS7019=m CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m |