diff options
| author | Guillaume Aubertin <g-aubertin@ti.com> | 2012-10-22 11:34:35 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:24:58 +0100 |
| commit | a434e182f555a9350a40992dcfb68d02044412ae (patch) | |
| tree | 507685d6c3590864f6337ceaa9ea232436ae7558 /arch | |
| parent | 7aec72d028f414ff2f88007dda4ea7939e5d2a79 (diff) | |
OMAP4: PANDA: align hwspinlock init with new spinlock API
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 9ec4ef70dbbc..900acc0c6a5c 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -28,7 +28,6 @@ #include <linux/hwspinlock.h> #include <linux/i2c/twl.h> #include <linux/mfd/twl6040.h> -#include <linux/hwspinlock.h> #include <linux/mfd/twl6040.h> #include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> @@ -468,9 +467,9 @@ static void __init omap_i2c_hwspinlock_init(int bus_id, int spinlock_id, { /* spinlock_id should be -1 for a generic lock request */ if (spinlock_id < 0) - pdata->handle = hwspin_lock_request(); + pdata->handle = hwspin_lock_request(USE_MUTEX_LOCK); else - pdata->handle = hwspin_lock_request_specific(spinlock_id); + pdata->handle = hwspin_lock_request_specific(spinlock_id, USE_MUTEX_LOCK); if (pdata->handle != NULL) { pdata->hwspin_lock_timeout = hwspin_lock_timeout; |