diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-01 00:06:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-01 00:06:44 (GMT) |
| commit | 2255702db4014d1c69d6037ed7bdad2d2e271985 (patch) | |
| tree | 86ca1b55fd9fd4381e9a20da584d5e019e44a299 | |
| parent | 9e5d25e82964939481de7940fc9c1d669dfc03e9 (diff) | |
| parent | c86576ea114a9a881cf7328dc7181052070ca311 (diff) | |
| download | linux-2255702db4014d1c69d6037ed7bdad2d2e271985.tar.xz | |
Merge tag 'mn10300-for-linus-v4.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull mn10300 fix from Guenter Roeck:
"A single patch to fix mn10300 build failures"
* tag 'mn10300-for-linus-v4.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
mn10300: Select CONFIG_HAVE_UID16 to fix build failure
| -rw-r--r-- | arch/mn10300/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 4434b54..78ae555 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -1,6 +1,7 @@ config MN10300 def_bool y select HAVE_OPROFILE + select HAVE_UID16 select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION select HAVE_ARCH_TRACEHOOK @@ -37,9 +38,6 @@ config HIGHMEM config NUMA def_bool n -config UID16 - def_bool y - config RWSEM_GENERIC_SPINLOCK def_bool y |