From 4722fe770d2df997019cb7ffeb07abd5e797230f Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 9 Jun 2011 20:07:20 +0200
Subject: [PATCH] --- yaml --- r: 255740 b: refs/heads/master c:
 e3ae0cac00042d7fb76914c30c5f991f918e65b4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/bcma/core.c       | 3 ++-
 trunk/include/linux/bcma/bcma.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1332709cc6e4..54016d1c126e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b49b35a671e59c16c33611ea2d5650438388663
+refs/heads/master: e3ae0cac00042d7fb76914c30c5f991f918e65b4
diff --git a/trunk/drivers/bcma/core.c b/trunk/drivers/bcma/core.c
index ced379f7b371..1ec7d4528dd0 100644
--- a/trunk/drivers/bcma/core.c
+++ b/trunk/drivers/bcma/core.c
@@ -19,7 +19,7 @@ bool bcma_core_is_enabled(struct bcma_device *core)
 }
 EXPORT_SYMBOL_GPL(bcma_core_is_enabled);
 
-static void bcma_core_disable(struct bcma_device *core, u32 flags)
+void bcma_core_disable(struct bcma_device *core, u32 flags)
 {
 	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
 		return;
@@ -31,6 +31,7 @@ static void bcma_core_disable(struct bcma_device *core, u32 flags)
 	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
 	udelay(1);
 }
+EXPORT_SYMBOL_GPL(bcma_core_disable);
 
 int bcma_core_enable(struct bcma_device *core, u32 flags)
 {
diff --git a/trunk/include/linux/bcma/bcma.h b/trunk/include/linux/bcma/bcma.h
index 6ff080eac0b2..3895aeb494a3 100644
--- a/trunk/include/linux/bcma/bcma.h
+++ b/trunk/include/linux/bcma/bcma.h
@@ -244,6 +244,7 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
 }
 
 extern bool bcma_core_is_enabled(struct bcma_device *core);
+extern void bcma_core_disable(struct bcma_device *core, u32 flags);
 extern int bcma_core_enable(struct bcma_device *core, u32 flags);
 
 #endif /* LINUX_BCMA_H_ */