From 3325655d8932f291c629dfb99230708fe7228d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 24 Feb 2012 07:22:51 +0100 Subject: [PATCH] --- yaml --- r: 290731 b: refs/heads/master c: fda82417884eecd9f2c8b4e6bb2039def0da7ec4 h: refs/heads/master i: 290729: 651f1d16a4b54a6a467dc5194b02e5aef79a3121 290727: fae2c01efc0f81d6b466663c694592ad0e7a3241 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d01b73625b0..426342306c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4ca00992ce0809e8cfdc452aa3f972e3be72654 +refs/heads/master: fda82417884eecd9f2c8b4e6bb2039def0da7ec4 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 7c54d1db4a44..d4a9e8e7deb3 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -65,7 +65,7 @@ #define BRCMF_USB_CBCTL_READ 1 #define BRCMF_USB_MAX_PKT_SIZE 1600 -#define BRCMF_USB_FW_NAME "brcm/brcmfmac-usb.bin" +#define BRCMF_USB_43236_FW_NAME "brcm/brcmfmac43236b.bin" enum usbdev_suspend_state { USBOS_SUSPEND_STATE_DEVICE_ACTIVE = 0, /* Device is busy, won't allow @@ -1229,7 +1229,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo) if (devinfo->image) return 0; - fwname = BRCMF_USB_FW_NAME; + fwname = BRCMF_USB_43236_FW_NAME; err = request_firmware(&fw, fwname, devinfo->dev); if (!fw) { @@ -1596,7 +1596,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = { { } }; MODULE_DEVICE_TABLE(usb, brcmf_usb_devid_table); -MODULE_FIRMWARE(BRCMF_USB_FW_NAME); +MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME); /* TODO: suspend and resume entries */ static struct usb_driver brcmf_usbdrvr = {