diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /net/mac80211/Kconfig | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'net/mac80211/Kconfig')
| -rw-r--r-- | net/mac80211/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 798d9b9462e2..9109262abd24 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
| @@ -93,7 +93,7 @@ config MAC80211_MESH | |||
| 93 | config MAC80211_LEDS | 93 | config MAC80211_LEDS |
| 94 | bool "Enable LED triggers" | 94 | bool "Enable LED triggers" |
| 95 | depends on MAC80211 | 95 | depends on MAC80211 |
| 96 | select NEW_LEDS | 96 | depends on LEDS_CLASS |
| 97 | select LEDS_TRIGGERS | 97 | select LEDS_TRIGGERS |
| 98 | ---help--- | 98 | ---help--- |
| 99 | This option enables a few LED triggers for different | 99 | This option enables a few LED triggers for different |