diff options
author | Olof Johansson <olof@lixom.net> | 2014-03-16 23:29:46 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-03-16 23:30:04 -0700 |
commit | 13ce64c8f7750ce59066a987951faff38bb7dd97 (patch) | |
tree | 2ff0ed20e8fce46072c00583796f63afb2371d01 | |
parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
parent | 4f3068f60503e08bc9e729528d9e54289980fa96 (diff) | |
download | op-kernel-dev-13ce64c8f7750ce59066a987951faff38bb7dd97.zip op-kernel-dev-13ce64c8f7750ce59066a987951faff38bb7dd97.tar.gz |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig index a305731..f7d9061 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. |