summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 14:01:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 14:01:27 -0700
commitc807b17375be26d7710b248deae6d75ecb32e4ba (patch)
treefb7ef4ac41fc11e13fb83050ba9d8a5451067add
parent1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296 (diff)
parent8ae053d62e88c400330ebaf27558bf02dde5a1fa (diff)
Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
Pullhwspinlock update from Ohad Ben-Cohen: "A single patch from Vincent extending OMAP's hwspinlock support to OMAP5" * tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock: hwspinlock/omap: support OMAP5 as well
-rw-r--r--drivers/hwspinlock/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig
index c7c3128393d1..70637d23b1f9 100644
--- a/drivers/hwspinlock/Kconfig
+++ b/drivers/hwspinlock/Kconfig
@@ -10,7 +10,7 @@ menu "Hardware Spinlock drivers"
config HWSPINLOCK_OMAP
tristate "OMAP Hardware Spinlock device"
- depends on ARCH_OMAP4
+ depends on ARCH_OMAP4 || SOC_OMAP5
select HWSPINLOCK
help
Say y here to support the OMAP Hardware Spinlock device (firstly