Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2255702d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mn10300-for-linus-v4.4-rc4' of...

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
parents 9e5d25e8 c86576ea
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
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