diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 19:46:43 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 19:46:43 +0100 |
commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /net/wireless/Kconfig | |
parent | driver-core: remove conditionals around devicetree pointers (diff) | |
parent | Linux 2.6.38-rc3 (diff) | |
download | linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.xz linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.zip |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'net/wireless/Kconfig')
-rw-r--r-- | net/wireless/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index d0ee29063e5d..1f1ef70f34f2 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -95,7 +95,7 @@ config CFG80211_DEBUGFS If unsure, say N. config CFG80211_INTERNAL_REGDB - bool "use statically compiled regulatory rules database" if EMBEDDED + bool "use statically compiled regulatory rules database" if EXPERT default n depends on CFG80211 ---help--- |