diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/net/wireless | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h index 9ecf2bf0d25d..47c135a7f4dc 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | |||
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm, | |||
87 | 87 | ||
88 | /* RX header as received from the hardware. */ | 88 | /* RX header as received from the hardware. */ |
89 | struct bcm43xx_rxhdr { | 89 | struct bcm43xx_rxhdr { |
90 | /* Frame Length. Must be generated explicitely in PIO mode. */ | 90 | /* Frame Length. Must be generated explicitly in PIO mode. */ |
91 | __le16 frame_length; | 91 | __le16 frame_length; |
92 | PAD_BYTES(2); | 92 | PAD_BYTES(2); |
93 | /* Flags field 1 */ | 93 | /* Flags field 1 */ |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 7a7797560a23..a6c7904de282 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -6047,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, | |||
6047 | * ends up causing problems. So, we just handle | 6047 | * ends up causing problems. So, we just handle |
6048 | * the WX extensions through the ipw2100_ioctl interface */ | 6048 | * the WX extensions through the ipw2100_ioctl interface */ |
6049 | 6049 | ||
6050 | /* memset() puts everything to 0, so we only have explicitely set | 6050 | /* memset() puts everything to 0, so we only have explicitly set |
6051 | * those values that need to be something else */ | 6051 | * those values that need to be something else */ |
6052 | 6052 | ||
6053 | /* If power management is turned on, default to AUTO mode */ | 6053 | /* If power management is turned on, default to AUTO mode */ |
@@ -7509,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev, | |||
7509 | switch (wrqu->power.flags & IW_POWER_MODE) { | 7509 | switch (wrqu->power.flags & IW_POWER_MODE) { |
7510 | case IW_POWER_ON: /* If not specified */ | 7510 | case IW_POWER_ON: /* If not specified */ |
7511 | case IW_POWER_MODE: /* If set all mask */ | 7511 | case IW_POWER_MODE: /* If set all mask */ |
7512 | case IW_POWER_ALL_R: /* If explicitely state all */ | 7512 | case IW_POWER_ALL_R: /* If explicitly state all */ |
7513 | break; | 7513 | break; |
7514 | default: /* Otherwise we don't support it */ | 7514 | default: /* Otherwise we don't support it */ |
7515 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", | 7515 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index feb8fcbab2d5..e3c828401b9a 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev, | |||
9603 | switch (wrqu->power.flags & IW_POWER_MODE) { | 9603 | switch (wrqu->power.flags & IW_POWER_MODE) { |
9604 | case IW_POWER_ON: /* If not specified */ | 9604 | case IW_POWER_ON: /* If not specified */ |
9605 | case IW_POWER_MODE: /* If set all mask */ | 9605 | case IW_POWER_MODE: /* If set all mask */ |
9606 | case IW_POWER_ALL_R: /* If explicitely state all */ | 9606 | case IW_POWER_ALL_R: /* If explicitly state all */ |
9607 | break; | 9607 | break; |
9608 | default: /* Otherwise we don't support it */ | 9608 | default: /* Otherwise we don't support it */ |
9609 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", | 9609 | IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", |
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index c2d71afd57e5..2402cb8dd328 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -4,18 +4,18 @@ | |||
4 | * Version: 0.4.1 | 4 | * Version: 0.4.1 |
5 | * Description: Netwave AirSurfer Wireless LAN PC Card driver | 5 | * Description: Netwave AirSurfer Wireless LAN PC Card driver |
6 | * Status: Experimental. | 6 | * Status: Experimental. |
7 | * Authors: John Markus Bjørndalen <johnm@cs.uit.no> | 7 | * Authors: John Markus Bjørndalen <johnm@cs.uit.no> |
8 | * Dag Brattli <dagb@cs.uit.no> | 8 | * Dag Brattli <dagb@cs.uit.no> |
9 | * David Hinds <dahinds@users.sourceforge.net> | 9 | * David Hinds <dahinds@users.sourceforge.net> |
10 | * Created at: A long time ago! | 10 | * Created at: A long time ago! |
11 | * Modified at: Mon Nov 10 11:54:37 1997 | 11 | * Modified at: Mon Nov 10 11:54:37 1997 |
12 | * Modified by: Dag Brattli <dagb@cs.uit.no> | 12 | * Modified by: Dag Brattli <dagb@cs.uit.no> |
13 | * | 13 | * |
14 | * Copyright (c) 1997 University of Tromsø, Norway | 14 | * Copyright (c) 1997 University of Tromsø, Norway |
15 | * | 15 | * |
16 | * Revision History: | 16 | * Revision History: |
17 | * | 17 | * |
18 | * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> | 18 | * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> |
19 | * - Fixed some bugs in netwave_rx and cleaned it up a bit. | 19 | * - Fixed some bugs in netwave_rx and cleaned it up a bit. |
20 | * (One of the bugs would have destroyed packets when receiving | 20 | * (One of the bugs would have destroyed packets when receiving |
21 | * multiple packets per interrupt). | 21 | * multiple packets per interrupt). |
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG; | |||
158 | module_param(pc_debug, int, 0); | 158 | module_param(pc_debug, int, 0); |
159 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | 159 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) |
160 | static char *version = | 160 | static char *version = |
161 | "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; | 161 | "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; |
162 | #else | 162 | #else |
163 | #define DEBUG(n, args...) | 163 | #define DEBUG(n, args...) |
164 | #endif | 164 | #endif |