From 0046bcbca5493a2c7a8d878c522d59a60125bba0 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:19:22 -0500
Subject: [PATCH] --- yaml --- r: 338094 b: refs/heads/master c:
 941906647a12749ae769b3414f652f1f03e22f69 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/csr/firmware.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e8abdc8eff20..d28a375e3cf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e543acf07db78cfc135e45c4ce0ed26ccf774c37
+refs/heads/master: 941906647a12749ae769b3414f652f1f03e22f69
diff --git a/trunk/drivers/staging/csr/firmware.c b/trunk/drivers/staging/csr/firmware.c
index 1d1c10392ad1..b42a4d6a0c36 100644
--- a/trunk/drivers/staging/csr/firmware.c
+++ b/trunk/drivers/staging/csr/firmware.c
@@ -233,8 +233,6 @@ unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len)
 int
 uf_run_unifihelper(unifi_priv_t *priv)
 {
-#ifdef CONFIG_HOTPLUG
-
 #ifdef ANDROID_BUILD
     char *prog = "/system/bin/unififw";
 #else
@@ -280,10 +278,6 @@ uf_run_unifihelper(unifi_priv_t *priv)
     r = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
 
     return r;
-#else
-    unifi_trace(priv, UDBG1, "Can't automatically download firmware because kernel does not have HOTPLUG\n");
-    return -1;
-#endif
 } /* uf_run_unifihelper() */
 
 #ifdef CSR_WIFI_SPLIT_PATCH