From 9616619dbebd36e2b1757005ec48fa83113dc2ec Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Sat, 14 Feb 2009 11:50:45 +0000
Subject: [PATCH] --- yaml --- r: 134623 b: refs/heads/master c:
 7f50ca07fffdfa8f74ff62e54bf569c745e906e5 h: refs/heads/master i:   134621:
 e2eb0adbf5eb5487e6066a94ba3d9f086722ae77   134619:
 0356c1bbf845d80c9622273613b824fb18f1249f   134615:
 71a91f355887ef1d54468a40188eda425bfc0e48   134607:
 2bbb25fa8a50b7715eca33313054e2c3315f1373   134591:
 b95124dec4a87086f3bb298424a893b780f29992 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/prism54/isl_ioctl.c | 3 ++-
 trunk/drivers/net/wireless/prism54/oid_mgt.c   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7d2a0edc9142..e855e3f6c2f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9da9e9544724ee25af493bf117e2a8413be34a8
+refs/heads/master: 7f50ca07fffdfa8f74ff62e54bf569c745e906e5
diff --git a/trunk/drivers/net/wireless/prism54/isl_ioctl.c b/trunk/drivers/net/wireless/prism54/isl_ioctl.c
index 57a150a22de5..4c97c6ad6f5d 100644
--- a/trunk/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/trunk/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2981,7 +2981,8 @@ prism54_set_spy(struct net_device *ndev,
 		union iwreq_data *uwrq, char *extra)
 {
 	islpci_private *priv = netdev_priv(ndev);
-	u32 u, oid = OID_INL_CONFIG;
+	u32 u;
+	enum oid_num_t oid = OID_INL_CONFIG;
 
 	down_write(&priv->mib_sem);
 	mgt_get(priv, OID_INL_CONFIG, &u);
diff --git a/trunk/drivers/net/wireless/prism54/oid_mgt.c b/trunk/drivers/net/wireless/prism54/oid_mgt.c
index 57a4ac34bed6..1187e6112a64 100644
--- a/trunk/drivers/net/wireless/prism54/oid_mgt.c
+++ b/trunk/drivers/net/wireless/prism54/oid_mgt.c
@@ -698,7 +698,7 @@ int
 mgt_commit(islpci_private *priv)
 {
 	int rvalue;
-	u32 u;
+	enum oid_num_t u;
 
 	if (islpci_get_state(priv) < PRV_STATE_INIT)
 		return 0;