Commit d2b150d0 authored Apr 05, 2014 by Linus Torvalds

arm-soc

Pull ARM SoC sh driver change from Arnd Bergmann:
 "The drivers/sh subdirectory used to get merged through the SH
  architecture tree, but things are in flux there and some of the
  drivers are shared with ARM shmobile, we have picked it up for the
  time being.

  There is only one trivial patch from Laurent Pinchart this time"

* tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  sh: intc: Enable driver compilation with COMPILE_TEST

parents cbda94e0 13ce64c8

drivers/sh/intc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ comment "Interrupt controller options"

		config INTC_USERIMASK
		bool "Userspace interrupt masking support"
		depends on ARCH_SHMOBILE \|\| (SUPERH && CPU_SH4A)
		depends on ARCH_SHMOBILE \|\| (SUPERH && CPU_SH4A) \|\| COMPILE_TEST
		help
		This enables support for hardware-assisted userspace hardirq
		masking.

Admin message