Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[safe/jmp/linux-2.6] / drivers / net / wireless / prism54 / oid_mgt.c

diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index 57a4ac3..1187e61 100644 (file)
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/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;