From 715066190d6f9a0ba0bd11df69d15f3b0068479d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 5 Jan 2009 10:46:00 -0800
Subject: [PATCH] --- yaml --- r: 126592 b: refs/heads/master c:
 f02466fc19f77fc47a0573d5c246b3333e076894 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/winbond/wbusb.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1c73af4cae04..2263038e3bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 310d465d8365dbb1258b972c8a7c35f8d9dc68a3
+refs/heads/master: f02466fc19f77fc47a0573d5c246b3333e076894
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
index cb4dee566f7f..b003f9a7e151 100644
--- a/trunk/drivers/staging/winbond/wbusb.c
+++ b/trunk/drivers/staging/winbond/wbusb.c
@@ -134,11 +134,12 @@ static int wbsoft_start(struct ieee80211_hw *dev)
 	return 0;
 }
 
-static int wbsoft_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
+static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
 {
 	struct wbsoft_priv *priv = dev->priv;
-
+	struct ieee80211_conf *conf = &dev->conf;
 	ChanInfo ch;
+
 	printk("wbsoft_config called\n");
 
 	ch.band = 1;