diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 23:01:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 23:01:27 +0200 |
| commit | c807b17375be26d7710b248deae6d75ecb32e4ba (patch) | |
| tree | fb7ef4ac41fc11e13fb83050ba9d8a5451067add | |
| parent | Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/l... (diff) | |
| parent | hwspinlock/omap: support OMAP5 as well (diff) | |
| download | linux-c807b17375be26d7710b248deae6d75ecb32e4ba.tar.xz linux-c807b17375be26d7710b248deae6d75ecb32e4ba.zip | |
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/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" 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 |