diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 09:30:21 -0700 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 09:30:21 -0700 |
commit | ac2a8bca03a6d281c78e803899001e22a92b92e9 (patch) | |
tree | 5969d5e812165a2b113601109833e8bd2e662d71 /drivers/mfd/Makefile | |
parent | a6a1cf3d963daaf80e467793060be1fa57599a4b (diff) | |
parent | 3c6e8d05d60d8106b5cdc730cf220b2a4b521b66 (diff) | |
download | linux-ac2a8bca03a6d281c78e803899001e22a92b92e9.tar.bz2 |
Merge branch 'ib-move-htc-egpio' into devel
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r-- | drivers/mfd/Makefile | 1 |
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 |