diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 18:38:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 18:38:41 -0400 |
| commit | d2b150d0647e055d7a71b1c33140280550b27dd6 (patch) | |
| tree | ab27e9a19c9ab3a81886e1fceda2034e21e4c9e5 /drivers/sh | |
| parent | cbda94e039c3862326a65d1d0506447af8330c3c (diff) | |
| parent | 13ce64c8f7750ce59066a987951faff38bb7dd97 (diff) | |
Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/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
Diffstat (limited to 'drivers/sh')
| -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 a305731742a9..f7d90617c9d9 100644 --- a/drivers/sh/intc/Kconfig +++ b/drivers/sh/intc/Kconfig | |||
| @@ -6,7 +6,7 @@ comment "Interrupt controller options" | |||
| 6 | 6 | ||
| 7 | config INTC_USERIMASK | 7 | config INTC_USERIMASK |
| 8 | bool "Userspace interrupt masking support" | 8 | bool "Userspace interrupt masking support" |
| 9 | depends on ARCH_SHMOBILE || (SUPERH && CPU_SH4A) | 9 | depends on ARCH_SHMOBILE || (SUPERH && CPU_SH4A) || COMPILE_TEST |
| 10 | help | 10 | help |
| 11 | This enables support for hardware-assisted userspace hardirq | 11 | This enables support for hardware-assisted userspace hardirq |
| 12 | masking. | 12 | masking. |