From: Linus Walleij Date: Wed, 28 Sep 2016 16:30:21 +0000 (-0700) Subject: Merge branch 'ib-move-htc-egpio' into devel X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac2a8bca03a6d281c78e803899001e22a92b92e9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'ib-move-htc-egpio' into devel --- ac2a8bca03a6d281c78e803899001e22a92b92e9 diff --cc drivers/gpio/Makefile index 915c7de1dd1b,32ebc07074ed..ab28a2daeacc --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@@ -46,8 -44,8 +46,9 @@@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93x obj-$(CONFIG_GPIO_ETRAXFS) += gpio-etraxfs.o obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o +obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o + obj-$(CONFIG_HTC_EGPIO) += gpio-htc-egpio.o obj-$(CONFIG_GPIO_ICH) += gpio-ich.o obj-$(CONFIG_GPIO_IOP) += gpio-iop.o obj-$(CONFIG_GPIO_IT87) += gpio-it87.o