diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:34:14 +0100 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /drivers/net/wireless/prism54/oid_mgt.c | |
| parent | printk: correct the behavior of printk_timed_ratelimit() (diff) | |
| parent | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | linux-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.xz linux-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.zip | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'drivers/net/wireless/prism54/oid_mgt.c')
| -rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index 57a4ac34bed6..1187e6112a64 100644 --- 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; |