diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-01-30 21:39:54 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-30 21:39:54 +0100 |
| commit | de8d7a53807c8d2bb04b59ff3a0daa225e81a775 (patch) | |
| tree | fcd911aff52d3192af95f1e2aee7ecfd4187d5ec /drivers/net/wireless/b43/main.h | |
| parent | 97c7952792018589640ecb3e62e1ab8f06005546 (diff) | |
| parent | c331997b6c9ad7f4b8075e6e60d3caa6e36f5938 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/b43/main.h')
| -rw-r--r-- | drivers/net/wireless/b43/main.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h index 8c684cd33529..abac25ee958d 100644 --- a/drivers/net/wireless/b43/main.h +++ b/drivers/net/wireless/b43/main.h @@ -137,9 +137,8 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on); struct b43_request_fw_context; -int b43_do_request_fw(struct b43_request_fw_context *ctx, - const char *name, - struct b43_firmware_file *fw); +int b43_do_request_fw(struct b43_request_fw_context *ctx, const char *name, + struct b43_firmware_file *fw, bool async); void b43_do_release_fw(struct b43_firmware_file *fw); #endif /* B43_MAIN_H_ */ |