diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/benet/be_main.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/benet/be_main.c')
-rw-r--r-- | drivers/net/benet/be_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 876b357101fa..c3a7db326c9f 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1877,7 +1877,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) | |||
1877 | goto fw_exit; | 1877 | goto fw_exit; |
1878 | } | 1878 | } |
1879 | 1879 | ||
1880 | dev_info(&adapter->pdev->dev, "Firmware flashed succesfully\n"); | 1880 | dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n"); |
1881 | 1881 | ||
1882 | fw_exit: | 1882 | fw_exit: |
1883 | release_firmware(fw); | 1883 | release_firmware(fw); |