iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-04-05 15:38:41 -07:00
parent cbda94e039 13ce64c8f7
commit d2b150d064
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sh/intc/Kconfig
View File

@@ -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.