diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /drivers/net/wireless/b43/Kconfig | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
| download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/net/wireless/b43/Kconfig')
| -rw-r--r-- | drivers/net/wireless/b43/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index e3f67b8d3f80..40fd9b7b1426 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig @@ -36,7 +36,7 @@ config B43_SSB choice prompt "Supported bus types" depends on B43 - default B43_BCMA_AND_SSB + default B43_BUSES_BCMA_AND_SSB config B43_BUSES_BCMA_AND_SSB bool "BCMA and SSB" |