diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /net/wireless | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index ab015c62d561..833b024f8f66 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig | |||
| @@ -39,4 +39,5 @@ config WIRELESS_EXT_SYSFS | |||
| 39 | files in /sys/class/net/*/wireless/. The same information | 39 | files in /sys/class/net/*/wireless/. The same information |
| 40 | is available via the ioctls as well. | 40 | is available via the ioctls as well. |
| 41 | 41 | ||
| 42 | Say Y if you have programs using it (we don't know of any). | 42 | Say Y if you have programs using it, like old versions of |
| 43 | hal. | ||