diff options
| author | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 13:51:00 (GMT) |
|---|---|---|
| committer | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 13:51:00 (GMT) |
| commit | 0d48297646c426cdd206b0e530495ab7eb02acd3 (patch) | |
| tree | 003db115fb07d125bade819a49da8b05b146d38b /drivers/gpio/Makefile | |
| parent | dd543f16bbaeb86c8131d2532791dcc2748c6e5f (diff) | |
| download | u-boot-fsl-qoriq-0d48297646c426cdd206b0e530495ab7eb02acd3.tar.xz | |
Upstream u-boot update and added QT1040-1GB device support
Diffstat (limited to 'drivers/gpio/Makefile')
| -rw-r--r-- | drivers/gpio/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
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 |