Skip to content

Commit

Permalink
Merge tag 'mn10300-for-linus-v4.4-rc4' of git://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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
  • Loading branch information
Linus Torvalds committed Dec 1, 2015
2 parents 9e5d25e + c86576e commit 2255702
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/mn10300/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -37,9 +38,6 @@ config HIGHMEM
config NUMA
def_bool n

config UID16
def_bool y

config RWSEM_GENERIC_SPINLOCK
def_bool y

Expand Down

0 comments on commit 2255702

Please sign in to comment.