diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
| commit | bb9c03d8a6893517737b16fdbeb54be3c73b3023 (patch) | |
| tree | 35fa0d1defaaf94641963a49126d7bb475ffa4c6 /drivers/net/wireless/ipw2x00 | |
| parent | 4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee (diff) | |
| parent | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 8feaa1d358ea..cb2552a6777c 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
| @@ -96,7 +96,7 @@ static int network_mode = 0; | |||
| 96 | static u32 ipw_debug_level; | 96 | static u32 ipw_debug_level; |
| 97 | static int associate; | 97 | static int associate; |
| 98 | static int auto_create = 1; | 98 | static int auto_create = 1; |
| 99 | static int led_support = 0; | 99 | static int led_support = 1; |
| 100 | static int disable = 0; | 100 | static int disable = 0; |
| 101 | static int bt_coexist = 0; | 101 | static int bt_coexist = 0; |
| 102 | static int hwcrypto = 0; | 102 | static int hwcrypto = 0; |
| @@ -12082,7 +12082,7 @@ module_param(auto_create, int, 0444); | |||
| 12082 | MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)"); | 12082 | MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)"); |
| 12083 | 12083 | ||
| 12084 | module_param_named(led, led_support, int, 0444); | 12084 | module_param_named(led, led_support, int, 0444); |
| 12085 | MODULE_PARM_DESC(led, "enable led control on some systems (default 0 off)"); | 12085 | MODULE_PARM_DESC(led, "enable led control on some systems (default 1 on)"); |
| 12086 | 12086 | ||
| 12087 | module_param(debug, int, 0444); | 12087 | module_param(debug, int, 0444); |
| 12088 | MODULE_PARM_DESC(debug, "debug output mask"); | 12088 | MODULE_PARM_DESC(debug, "debug output mask"); |