projects/linux·commit c807b173

Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

c807b173 · Linus Torvalds <[email protected]> · 2013-05-07 14:01:27 -07:00

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
Commit
c807b17375be26d7710b248deae6d75ecb32e4ba
Parents
1b5feb4c · 8ae053d6

Merge commit. Changes below are compared with the first parent: 1b5feb4c.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/hwspinlock/Kconfigmodified+1−1View file

drivers/hwspinlock/Kconfig

View file
diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig
index c7c3128..70637d2 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