diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 19:06:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 19:06:44 -0500 |
| commit | 2255702db4014d1c69d6037ed7bdad2d2e271985 (patch) | |
| tree | 86ca1b55fd9fd4381e9a20da584d5e019e44a299 | |
| parent | 9e5d25e82964939481de7940fc9c1d669dfc03e9 (diff) | |
| parent | c86576ea114a9a881cf7328dc7181052070ca311 (diff) | |
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 4434b54e1d87..78ae5552fdb8 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config MN10300 | 1 | config MN10300 |
| 2 | def_bool y | 2 | def_bool y |
| 3 | select HAVE_OPROFILE | 3 | select HAVE_OPROFILE |
| 4 | select HAVE_UID16 | ||
| 4 | select GENERIC_IRQ_SHOW | 5 | select GENERIC_IRQ_SHOW |
| 5 | select ARCH_WANT_IPC_PARSE_VERSION | 6 | select ARCH_WANT_IPC_PARSE_VERSION |
| 6 | select HAVE_ARCH_TRACEHOOK | 7 | select HAVE_ARCH_TRACEHOOK |
| @@ -37,9 +38,6 @@ config HIGHMEM | |||
| 37 | config NUMA | 38 | config NUMA |
| 38 | def_bool n | 39 | def_bool n |
| 39 | 40 | ||
| 40 | config UID16 | ||
| 41 | def_bool y | ||
| 42 | |||
| 43 | config RWSEM_GENERIC_SPINLOCK | 41 | config RWSEM_GENERIC_SPINLOCK |
| 44 | def_bool y | 42 | def_bool y |
| 45 | 43 | ||