diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 21:12:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 21:12:50 -0700 |
| commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
| tree | 7211df5704b743a7667159748c670a9744164482 /drivers/net/wireless/hostap | |
| parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
| parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index aa15cc4269a1..50f87b60b0bd 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -1466,7 +1466,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial) * before it starts acting as an AP, so reset port automatically * here just in case */ if (initial && prism2_reset_port(dev)) { - printk("%s: MAC port 0 reseting failed\n", dev->name); + printk("%s: MAC port 0 resetting failed\n", dev->name); return 1; } @@ -1557,7 +1557,7 @@ static void prism2_hw_reset(struct net_device *dev) static long last_reset = 0; /* do not reset card more than once per second to avoid ending up in a - * busy loop reseting the card */ + * busy loop resetting the card */ if (time_before_eq(jiffies, last_reset + HZ)) return; last_reset = jiffies; |