Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / Makefile

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 441f198aac8630df422a00c9444cab2732df2a3c..9a470d2235f7f529ba2c4e0e2b1cb12deb4d39cc 100755 (executable)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -46,10 +46,13 @@ obj-$(CONFIG_MACH_U300)             += gpio-u300.o
 obj-$(CONFIG_PLAT_NOMADIK)     += gpio-nomadik.o
 obj-$(CONFIG_GPIO_RDC321X)     += rdc321x-gpio.o
 obj-$(CONFIG_ARCH_RK29)                += gpio-rk29.o
+obj-$(CONFIG_ARCH_RK2928)      += gpio-rk30.o
 obj-$(CONFIG_ARCH_RK30)                += gpio-rk30.o
+obj-$(CONFIG_ARCH_RK31)                += gpio-rk30.o
 obj-$(CONFIG_GPIO_JANZ_TTL)    += janz-ttl.o
 obj-$(CONFIG_GPIO_SX150X)      += sx150x.o
 obj-$(CONFIG_GPIO_VX855)       += vx855_gpio.o
 obj-$(CONFIG_GPIO_ML_IOH)      += ml_ioh_gpio.o
 obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o
-obj-$(CONFIG_GPIO_TPS65910)    += tps65910-gpio.o
+obj-$(CONFIG_GPIO_TPS65910)    += gpio-tps65910.o
+obj-$(CONFIG_GPIO_TPS65912)    += gpio-tps65912.o