ARM: SoC: sh driver changes

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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUz/2DGCrR//JCVInAQI+oA/9HWu+NqrsTZ8HtBEpol+hQFG7sl0BGKsT
 qCF6PR4Oo/fPmsKlPCtPsHiQHaVk8Ompy/crwyI0ue71/HcZA5+GQ8qCa/aybn1p
 yvL2jSzKHNnNnSoa5844h6mV31+3QQe4C+sD//Ar6dJeZi49l/Xbb4jfRXaavb3h
 tQwCtI1MJ7gqhm4YlBuq9vS0vRJ1igiP2EJMjH3QHKehrmAM1C9ug72kp6+v93Gh
 VTeM7y/hGaIlip/2OgW+I1qTxQNiuBygO+YWE73iFoODcGITlERJiRivw696wzYB
 3Te6suxHAS67tf3s96O0GFQZmfTmKLLwbtJvETCQWY5+aoajU/lLwytbR3duyh67
 hl35qiCh/Oc07TgsrJRWnpll7E0o5rA178pLjlf8C/uw1ok6lAlXqMKh9ZYwEPP1
 joIAhXLMqiC6XggorZpR1TJei6/MUlsaaL0L7bzGBmbMYAfDjeiCpfydtSg/w4bE
 /LpBIop061jQMCANzaERidZgq4RQ3/Fp/xGrZX0ZIkCYoOihT03S4tLLS13rfDM1
 1DDA0/tXvVgPWv9sCRDWeBURtHg8n9QgkGe95I8BWnnRC4A+DkccP1pGzxLC+z/z
 6MQVO+Oo9QQmnyxLzQgQLVTfBay9kLCfNe+9bVfgV0V5f3EA4JBQcU1biT1uBLYw
 culjO8KHdp0=
 =BCkM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-04-05 15:38:41 -07:00
commit d2b150d064

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.