diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-11 02:41:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-11 02:41:43 -0400 |
| commit | 84503ddd65e804ccdeedee3f307b40d80ff793e6 (patch) | |
| tree | c7b805f441b1d8cb2e86b8411cf2302ff46186b4 /drivers/net/wireless/b43legacy/Kconfig | |
| parent | 51611a120e8120290152edd7d0020d22a7f4b4a3 (diff) | |
| parent | 2f0accc13520b2644b85f80aedce10d10d88b0ca (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/b43legacy/Kconfig')
| -rw-r--r-- | drivers/net/wireless/b43legacy/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/b43legacy/Kconfig index 6893f439df70..94a463478053 100644 --- a/drivers/net/wireless/b43legacy/Kconfig +++ b/drivers/net/wireless/b43legacy/Kconfig | |||
| @@ -42,14 +42,6 @@ config B43LEGACY_LEDS | |||
| 42 | depends on B43LEGACY && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43LEGACY) | 42 | depends on B43LEGACY && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43LEGACY) |
| 43 | default y | 43 | default y |
| 44 | 44 | ||
| 45 | # RFKILL support | ||
| 46 | # This config option automatically enables b43legacy RFKILL support, | ||
| 47 | # if it's possible. | ||
| 48 | config B43LEGACY_RFKILL | ||
| 49 | bool | ||
| 50 | depends on B43LEGACY && (RFKILL = y || RFKILL = B43LEGACY) | ||
| 51 | default y | ||
| 52 | |||
| 53 | # This config option automatically enables b43 HW-RNG support, | 45 | # This config option automatically enables b43 HW-RNG support, |
| 54 | # if the HW-RNG core is enabled. | 46 | # if the HW-RNG core is enabled. |
| 55 | config B43LEGACY_HWRNG | 47 | config B43LEGACY_HWRNG |