summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-17 07:29:46 +0100
committerOlof Johansson <olof@lixom.net>2014-03-17 07:30:04 +0100
commit13ce64c8f7750ce59066a987951faff38bb7dd97 (patch)
tree2ff0ed20e8fce46072c00583796f63afb2371d01
parentLinux 3.14-rc5 (diff)
parentsh: intc: Enable driver compilation with COMPILE_TEST (diff)
downloadlinux-13ce64c8f7750ce59066a987951faff38bb7dd97.tar.xz
linux-13ce64c8f7750ce59066a987951faff38bb7dd97.zip
Merge tag 'renesas-intc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/sh
Merge "Renesas intc Updates for v3.15" from Simon Horman: * Enable driver compilation with COMPILE_TEST * tag 'renesas-intc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh: intc: Enable driver compilation with COMPILE_TEST Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--drivers/sh/intc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig
index a305731742a9..f7d90617c9d9 100644
--- a/drivers/sh/intc/Kconfig
+++ b/drivers/sh/intc/Kconfig
@@ -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.