diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/uwb | |
| parent | r6040: bump release number to 0.20 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-7f46b1343f723f98634a5dcee47856b2000079ed.tar.xz linux-dev-7f46b1343f723f98634a5dcee47856b2000079ed.zip | |
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) goto error_create; } - /* setup the fops and upload the firmare */ + /* setup the fops and upload the firmware */ i1480->pre_fw_name = "i1480-pre-phy-0.0.bin"; i1480->mac_fw_name = "i1480-usb-0.0.bin"; i1480->mac_fw_name_deprecate = "ptc-0.0.bin"; |