From 0bfa1c1eaa11c35a5a21572d984b98c14589a5cd Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Sat, 1 Sep 2012 12:06:03 +0300
Subject: [PATCH] --- yaml --- r: 324778 b: refs/heads/master c:
 879a901f7eb6271d82da40cfb3c5bc3b6bb5c3fe h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/csr/netdev.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8c9c6eaf44a6..bad0d0c57e95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d99c525a0a1e981d89cc8f42b721f5973e684dd
+refs/heads/master: 879a901f7eb6271d82da40cfb3c5bc3b6bb5c3fe
diff --git a/trunk/drivers/staging/csr/netdev.c b/trunk/drivers/staging/csr/netdev.c
index 01ec08e15b16..6fac0681210d 100644
--- a/trunk/drivers/staging/csr/netdev.c
+++ b/trunk/drivers/staging/csr/netdev.c
@@ -338,21 +338,13 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id)
     interfacePriv->connected = UnifiConnectedUnknown;  /* -1 unknown, 0 no, 1 yes */
 
 #ifdef USE_DRIVER_LOCK
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
     sema_init(&priv->lock, 1);
-#else
-    init_MUTEX(&priv->lock);
-#endif
 #endif /* USE_DRIVER_LOCK */
 
     spin_lock_init(&priv->send_signal_lock);
 
     spin_lock_init(&priv->m4_lock);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
     sema_init(&priv->ba_mutex, 1);
-#else
-    init_MUTEX(&priv->ba_mutex);
-#endif
 
 #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION))
     spin_lock_init(&priv->wapi_lock);