diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 17:01:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 17:01:27 -0400 |
| commit | c807b17375be26d7710b248deae6d75ecb32e4ba (patch) | |
| tree | fb7ef4ac41fc11e13fb83050ba9d8a5451067add /drivers/hwspinlock | |
| parent | 1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296 (diff) | |
| parent | 8ae053d62e88c400330ebaf27558bf02dde5a1fa (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
Diffstat (limited to 'drivers/hwspinlock')
| -rw-r--r-- | drivers/hwspinlock/Kconfig | 2 |
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" | |||
| 10 | 10 | ||
| 11 | config HWSPINLOCK_OMAP | 11 | config HWSPINLOCK_OMAP |
| 12 | tristate "OMAP Hardware Spinlock device" | 12 | tristate "OMAP Hardware Spinlock device" |
| 13 | depends on ARCH_OMAP4 | 13 | depends on ARCH_OMAP4 || SOC_OMAP5 |
| 14 | select HWSPINLOCK | 14 | select HWSPINLOCK |
| 15 | help | 15 | help |
| 16 | Say y here to support the OMAP Hardware Spinlock device (firstly | 16 | Say y here to support the OMAP Hardware Spinlock device (firstly |