cw1200: Rename 'sbus' to 'hwbus'

This avoids problems when building on SPARC targets due to the driver
calling the bus abstraction layer 'sbus'.  Not that any SBUS-sporting
SPARC targets are likely to have an SDIO controller, but this is the
correct thing to do.

See http://kisskb.ellerman.id.au/kisskb/buildresult/8846508/

Signed-off-by:  Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/cw1200/cw1200.h b/drivers/net/wireless/cw1200/cw1200.h
index e9424e635883..95320f2b25eb 100644
--- a/drivers/net/wireless/cw1200/cw1200.h
+++ b/drivers/net/wireless/cw1200/cw1200.h
@@ -30,7 +30,7 @@
 #include "pm.h"
 
 /* Forward declarations */
-struct sbus_ops;
+struct hwbus_ops;
 struct task_struct;
 struct cw1200_debug_priv;
 struct firmware;
@@ -109,8 +109,8 @@ struct cw1200_common {
         u8 mac_addr[ETH_ALEN];
 
         /* Hardware interface */
-        const struct sbus_ops           *sbus_ops;
-        struct sbus_priv                *sbus_priv;
+        const struct hwbus_ops          *hwbus_ops;
+        struct hwbus_priv               *hwbus_priv;
 
         /* Hardware information */
         enum {
@@ -298,8 +298,8 @@ struct cw1200_sta_priv {
 };
 
 /* interfaces for the drivers */
-int cw1200_core_probe(const struct sbus_ops *sbus_ops,
-                      struct sbus_priv *sbus,
+int cw1200_core_probe(const struct hwbus_ops *hwbus_ops,
+                      struct hwbus_priv *hwbus,
                       struct device *pdev,
                       struct cw1200_common **pself,
                       int ref_clk, const u8 *macaddr,