diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
| commit | 6cf4569ce3561dec560147e6051959d6896b23d1 (patch) | |
| tree | 2b3dca47673824975c35a708a6d9d24ff46a2771 /arch/arm/Kconfig | |
| parent | 2e40795c3bf344cfb5220d94566205796e3ef19a (diff) | |
| parent | 42e0ebdef53d91891939a475c6ef23970829ff99 (diff) | |
| download | blackbird-op-linux-6cf4569ce3561dec560147e6051959d6896b23d1.tar.gz blackbird-op-linux-6cf4569ce3561dec560147e6051959d6896b23d1.zip | |
Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.10
As well as the usual smattering of driver specific fixes collected since
the merge window this has one particularly important fix to the core for
handling of aux_devs which was broken during the merge window by some of
the componentization refactoring.
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5fab553fd03a..186c4c214e0a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1502,8 +1502,7 @@ source kernel/Kconfig.preempt config HZ_FIXED int - default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \ - ARCH_S5PV210 || ARCH_EXYNOS4 + default 200 if ARCH_EBSA110 default 128 if SOC_AT91RM9200 default 0 |
