diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 13:54:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 13:54:03 -0500 |
| commit | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (patch) | |
| tree | ed690568a27b7231b8a507e8ba07c1ae34868e5c /drivers/ssb | |
| parent | c5e818ef081c4144177fdbdeed154332cd7e4d7a (diff) | |
| parent | 83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1 (diff) | |
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 | |||
| 167 | 167 | ||
| 168 | config SSB_DRIVER_GPIO | 168 | config SSB_DRIVER_GPIO |
| 169 | bool "SSB GPIO driver" | 169 | bool "SSB GPIO driver" |
| 170 | depends on SSB | 170 | depends on SSB && GPIOLIB |
| 171 | select GPIOLIB | ||
| 172 | help | 171 | help |
| 173 | Driver to provide access to the GPIO pins on the bus. | 172 | Driver to provide access to the GPIO pins on the bus. |
| 174 | 173 | ||