diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 19:26:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 19:26:55 -0700 |
| commit | 2f6d7c1b34403b97fa57473edcb6749d1db5ace3 (patch) | |
| tree | 97da33c077b08b72a361ff5a4542b86d190b0164 /drivers/net/wireless/iwlwifi/iwl-led.c | |
| parent | df597efb5737063497f1a4f7c996cc9aec294230 (diff) | |
| parent | 1e4247d457c6a42e4a05cb7dfa4e6ea1fa65c112 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-led.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-led.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c index 8c8115293b3..7cce8f85bcc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c @@ -91,8 +91,8 @@ static int iwl_send_led_cmd(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd) .id = REPLY_LEDS_CMD, .len = sizeof(struct iwl_led_cmd), .data = led_cmd, - .meta.flags = CMD_ASYNC, - .meta.u.callback = NULL, + .flags = CMD_ASYNC, + .callback = NULL, }; u32 reg; |