diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/uwb | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/uwb')
| -rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index 686795e97195..c7080d497311 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
| @@ -387,7 +387,7 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id) | |||
| 387 | goto error_create; | 387 | goto error_create; |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | /* setup the fops and upload the firmare */ | 390 | /* setup the fops and upload the firmware */ |
| 391 | i1480->pre_fw_name = "i1480-pre-phy-0.0.bin"; | 391 | i1480->pre_fw_name = "i1480-pre-phy-0.0.bin"; |
| 392 | i1480->mac_fw_name = "i1480-usb-0.0.bin"; | 392 | i1480->mac_fw_name = "i1480-usb-0.0.bin"; |
| 393 | i1480->mac_fw_name_deprecate = "ptc-0.0.bin"; | 393 | i1480->mac_fw_name_deprecate = "ptc-0.0.bin"; |