Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / prism54 / isl_ioctl.c

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 57a150a22de5c6544bee00f7799e5b2caf9164e6..4c97c6ad6f5dea80cfee1869551e1ea32d50818d 100644 (file)
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/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);