diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/net/wireless/ipw2x00 | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index 973125242490..5fe17cbab1f3 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h | |||
| @@ -1045,7 +1045,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW | |||
| 1045 | IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP | 1045 | IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP |
| 1046 | IPW_ORD_POWER_MGMT_INDEX, //NS // | 1046 | IPW_ORD_POWER_MGMT_INDEX, //NS // |
| 1047 | IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon | 1047 | IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon |
| 1048 | IPW_ORD_COUNTRY_CHANNELS, // channels suported by country | 1048 | IPW_ORD_COUNTRY_CHANNELS, // channels supported by country |
| 1049 | // IPW_ORD_COUNTRY_CHANNELS: | 1049 | // IPW_ORD_COUNTRY_CHANNELS: |
| 1050 | // For 11b the lower 2-byte are used for channels from 1-14 | 1050 | // For 11b the lower 2-byte are used for channels from 1-14 |
| 1051 | // and the higher 2-byte are not used. | 1051 | // and the higher 2-byte are not used. |