diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/net/benet | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/net/benet')
-rw-r--r-- | drivers/net/benet/be_cmds.h | 2 | ||||
-rw-r--r-- | drivers/net/benet/be_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index e7323be507d0..92b87ef156ed 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h | |||
@@ -444,7 +444,7 @@ enum be_if_flags { | |||
444 | * filtering capabilities. */ | 444 | * filtering capabilities. */ |
445 | struct be_cmd_req_if_create { | 445 | struct be_cmd_req_if_create { |
446 | struct be_cmd_req_hdr hdr; | 446 | struct be_cmd_req_hdr hdr; |
447 | u32 version; /* ignore currntly */ | 447 | u32 version; /* ignore currently */ |
448 | u32 capability_flags; | 448 | u32 capability_flags; |
449 | u32 enable_flags; | 449 | u32 enable_flags; |
450 | u8 mac_addr[ETH_ALEN]; | 450 | u8 mac_addr[ETH_ALEN]; |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 957a0f7f2764..24c7d9900baa 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1982,7 +1982,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) | |||
1982 | goto fw_exit; | 1982 | goto fw_exit; |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | dev_info(&adapter->pdev->dev, "Firmware flashed succesfully\n"); | 1985 | dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n"); |
1986 | 1986 | ||
1987 | fw_exit: | 1987 | fw_exit: |
1988 | release_firmware(fw); | 1988 | release_firmware(fw); |