diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /drivers/net/wireless/ipw2x00/ipw2200.c | |
parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (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: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 4a92af1d7877..e17a4593e1f5 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -8844,7 +8844,7 @@ static int ipw_wx_set_mode(struct net_device *dev, | |||
8844 | #endif /* CONFIG_IPW2200_MONITOR */ | 8844 | #endif /* CONFIG_IPW2200_MONITOR */ |
8845 | 8845 | ||
8846 | /* Free the existing firmware and reset the fw_loaded | 8846 | /* Free the existing firmware and reset the fw_loaded |
8847 | * flag so ipw_load() will bring in the new firmawre */ | 8847 | * flag so ipw_load() will bring in the new firmware */ |
8848 | free_firmware(); | 8848 | free_firmware(); |
8849 | 8849 | ||
8850 | priv->ieee->iw_mode = wrqu->mode; | 8850 | priv->ieee->iw_mode = wrqu->mode; |