diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 14:44:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 14:44:09 -0400 |
| commit | 75bcc84445bccf40a6215ff6fc6dd91978b1490e (patch) | |
| tree | 1f2cb11a503ce3ae4d4c7ef6ffe9ac5f32536b50 /drivers/sh/intc | |
| parent | cc07aabc53978ae09a1d539237189f7c9841060a (diff) | |
| parent | 2f35fb3c8a6018a0a5fe4a7fb0948b853c157256 (diff) | |
Merge tag 'renesas-sh-drivers-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next
Pull SH driver update from Simon Horman:
- PM Runtime enhancements targeted for use with ARM-based Renesas R-Car
Gen2 SoCs
- Restrict INTC_USERIMASK to SH4A as it is only used there
* tag 'renesas-sh-drivers-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: Enable PM runtime for new R-Car Gen2 SoCs
drivers: sh: pm_runtime implementation needs to suspend and resume devices
drivers: sh: Restrict INTC_USERIMASK to SH4A
drivers: sh: pm_runtime does not need idle callback
Diffstat (limited to 'drivers/sh/intc')
| -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 f7d90617c9d9..60228fae943f 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) || COMPILE_TEST | 9 | depends on (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. |