+From 90d564a00cca544b9eb4e6eff3790d5f0f8676b0 Mon Sep 17 00:00:00 2001
+From: Nick Bowler <nbowler@draconx.ca>
+Date: Wed, 17 Nov 2010 21:24:42 -0500
+Subject: [PATCH] Convert DECLARE_MUTEX to DEFINE_SEMAPHORE.
+
+---
+ thinkpad_ec.c | 2 +-
+ tp_smapi.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/thinkpad_ec.c b/thinkpad_ec.c
+index 2d77a64..e026a72 100644
+--- a/thinkpad_ec.c
++++ b/thinkpad_ec.c
+@@ -88,7 +88,7 @@ static u64 prefetch_jiffies; /* time of prefetch, or: */
+ #define TPC_PREFETCH_JUNK (INITIAL_JIFFIES+1) /* Ignore prefetch */
+
+ /* Locking: */
+-static DECLARE_MUTEX(thinkpad_ec_mutex);
++static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
+
+ /* Kludge in case the ACPI DSDT reserves the ports we need. */
+ static int force_io; /* Willing to do IO to ports we couldn't reserve? */
+diff --git a/tp_smapi.c b/tp_smapi.c
+index 0cdbd0e..f6c833f 100644
+--- a/tp_smapi.c
++++ b/tp_smapi.c
+@@ -109,7 +109,7 @@ static struct { u8 rc; char *msg; int ret; } smapi_retcode[] =
+ #define SMAPI_PORT2 0x4F /* fixed port, meaning unclear */
+ static unsigned short smapi_port; /* APM control port, normally 0xB2 */
+
+-static DECLARE_MUTEX(smapi_mutex);
++static DEFINE_SEMAPHORE(smapi_mutex);
+
+ /**
+ * find_smapi_port - read SMAPI port from NVRAM
+--
+1.7.2.2
+