mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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
This commit is contained in:
commit
9ebea3829f
70 changed files with 6497 additions and 217 deletions
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue