diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 19:54:03 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 19:54:03 +0100 |
| commit | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (patch) | |
| tree | ed690568a27b7231b8a507e8ba07c1ae34868e5c /drivers/ssb | |
| parent | ath9k_hw: remove a useless WARN_ON (diff) | |
| parent | mwifiex: fix typo in PCIe adapter NULL check (diff) | |
| download | linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.xz linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index f7305e2fddcc..5ff3a4f19443 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -167,8 +167,7 @@ config SSB_DRIVER_GIGE config SSB_DRIVER_GPIO bool "SSB GPIO driver" - depends on SSB - select GPIOLIB + depends on SSB && GPIOLIB help Driver to provide access to the GPIO pins on the bus. |