diff options
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 4 |
2 files changed, 0 insertions, 16 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 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 3209071..1396467 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -37,11 +37,7 @@ obj-$(CONFIG_DA8XX_GPIO) += da8xx_gpio.o obj-$(CONFIG_DM644X_GPIO) += da8xx_gpio.o obj-$(CONFIG_ALTERA_PIO) += altera_pio.o obj-$(CONFIG_MPC83XX_GPIO) += mpc83xx_gpio.o -<<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 obj-$(CONFIG_MPC85XX_GPIO) += mpc85xx_gpio.o -======= -obj-$(CONFIG_MPC8XXX_GPIO) += gpio-mpc8xxx.o ->>>>>>> dm: gpio: Add DM GPIO driver for MPC8xxx platforms obj-$(CONFIG_SH_GPIO_PFC) += sh_pfc.o obj-$(CONFIG_OMAP_GPIO) += omap_gpio.o obj-$(CONFIG_DB8500_GPIO) += db8500_gpio.o |