diff options
| author | Evert Pap <evert.pap@sintecs.nl> | 2016-09-16 13:16:50 (GMT) |
|---|---|---|
| committer | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 08:07:14 (GMT) |
| commit | 91259b783fb00422df6157b85317bf5035c72ed4 (patch) | |
| tree | 2922ed570d93d45741573e20ef62053e0cc8adea /drivers/gpio/Kconfig | |
| parent | 82a006ca2df310164bb48c36a793d1b733cf4af8 (diff) | |
| download | u-boot-fsl-qoriq-91259b783fb00422df6157b85317bf5035c72ed4.tar.xz | |
merge with master
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 34c4a40..fecb2fc 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -34,6 +34,7 @@ config DWAPB_GPIO help Support for the Designware APB GPIO driver. +<<<<<<< 82a006ca2df310164bb48c36a793d1b733cf4af8 <<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 config AT91_GPIO bool "AT91 PIO GPIO driver" @@ -56,6 +57,8 @@ config MPC8XXX_GPIO Support for the NXP (Freescale) MPC/QorIQ GPIO controller >>>>>>> dm: gpio: Add DM GPIO driver for MPC8xxx platforms +======= +>>>>>>> merge with master config ATMEL_PIO4 bool "ATMEL PIO4 driver" depends on DM_GPIO |