diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-12 10:27:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-12 10:27:39 +0200 |
| commit | 232a73dda2f2dba9002b727eb3ec76d82882b90c (patch) | |
| tree | 308cdeea9bf18de71af79dcd5a30a8f2be9af6da /arch/mips/Kconfig | |
| parent | 889d66848b12d891248b03abcb2a42047f8e172a (diff) | |
| parent | ca62bed0bbf9baf88d8bb404d72dee3b44ef057e (diff) | |
| download | kernel_goldelico_gta04-232a73dda2f2dba9002b727eb3ec76d82882b90c.zip kernel_goldelico_gta04-232a73dda2f2dba9002b727eb3ec76d82882b90c.tar.gz kernel_goldelico_gta04-232a73dda2f2dba9002b727eb3ec76d82882b90c.tar.bz2 | |
Merge tag 'asoc-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.9
A few updates, more than I'd like, fixing some relatively small issues
but mostly driver specific ones. Nothing wildly exciting so if it
doesn't make v3.9 it won't be the end of the world but it'd be nice.
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cd2e21f..51244bf 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -18,7 +18,7 @@ config MIPS select HAVE_KRETPROBES select HAVE_DEBUG_KMEMLEAK select ARCH_BINFMT_ELF_RANDOMIZE_PIE - select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT select RTC_LIB if !MACH_LOONGSON select GENERIC_ATOMIC64 if !64BIT select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE @@ -657,7 +657,7 @@ config SNI_RM bool "SNI RM200/300/400" select FW_ARC if CPU_LITTLE_ENDIAN select FW_ARC32 if CPU_LITTLE_ENDIAN - select SNIPROM if CPU_BIG_ENDIAN + select FW_SNIPROM if CPU_BIG_ENDIAN select ARCH_MAY_HAVE_PC_FDC select BOOT_ELF32 select CEVT_R4K @@ -1144,7 +1144,7 @@ config DEFAULT_SGI_PARTITION config FW_ARC32 bool -config SNIPROM +config FW_SNIPROM bool config BOOT_ELF32 @@ -1493,7 +1493,6 @@ config CPU_XLP select CPU_SUPPORTS_32BIT_KERNEL select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_HIGHMEM - select CPU_HAS_LLSC select WEAK_ORDERING select WEAK_REORDERING_BEYOND_LLSC select CPU_HAS_PREFETCH |