summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorLinus Walleij2016-09-28 18:30:21 +0200
committerLinus Walleij2016-09-28 18:30:21 +0200
commitac2a8bca03a6d281c78e803899001e22a92b92e9 (patch)
tree5969d5e812165a2b113601109833e8bd2e662d71 /drivers/mfd/Makefile
parentgpio: MAINTAINERS: Add an entry for GPIO mockup driver (diff)
parentmfd/gpio: Move HTC GPIO driver to GPIO subsystem (diff)
downloadkernel-qcow2-linux-ac2a8bca03a6d281c78e803899001e22a92b92e9.tar.gz
kernel-qcow2-linux-ac2a8bca03a6d281c78e803899001e22a92b92e9.tar.xz
kernel-qcow2-linux-ac2a8bca03a6d281c78e803899001e22a92b92e9.zip
Merge branch 'ib-move-htc-egpio' into devel
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r--drivers/mfd/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 42acbcdeb4f6..2bf6a1ac7428 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -18,7 +18,6 @@ rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
obj-$(CONFIG_MFD_RTSX_PCI) += rtsx_pci.o
obj-$(CONFIG_MFD_RTSX_USB) += rtsx_usb.o
-obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o
obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o