diff options
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index fecb2fc..ffeda94 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -34,8 +34,6 @@ config DWAPB_GPIO help Support for the Designware APB GPIO driver. -<<<<<<< 82a006ca2df310164bb48c36a793d1b733cf4af8 -<<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 config AT91_GPIO bool "AT91 PIO GPIO driver" depends on DM_GPIO @@ -48,17 +46,7 @@ config AT91_GPIO The assignment to a function of an embedded peripheral is the responsibility of AT91 Pinctrl driver. This driver is responsible for the general-purpose I/O. -======= -config MPC8XXX_GPIO - bool "NXP (Freescale) MPC8xxx driver" - depends on DM_GPIO - default n - help - 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 |