From: Lee Jones Date: Mon, 8 Jan 2018 11:02:37 +0000 (+0000) Subject: Merge branches 'ib-mfd-leds-4.16', 'ib-mfd-memstick-misc-mmc-4.16', 'ib-mfd-platform... X-Git-Tag: v4.19~1772^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8848ff42062dde7e641b8373d856419efa8c5484;p=platform%2Fkernel%2Flinux-rpi.git Merge branches 'ib-mfd-leds-4.16', 'ib-mfd-memstick-misc-mmc-4.16', 'ib-mfd-platform-4.16' and 'ib-mfd-tty-watchdog-4.16', tag 'ib-extcon-mfd-4.16-1' into ibs-for-mfd-merged Immutable branch for both MFD and EXTCON tree. --- 8848ff42062dde7e641b8373d856419efa8c5484 diff --cc drivers/mfd/Makefile index d9474ad,d9474ad,d9474ad,293e223,fcd8af8,61abc29..d9d2cf0 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@@@@@@ -17,12 -17,12 -17,12 -17,8 -17,13 -17,12 +17,9 @@@@@@@ cros_ec_core-$(CONFIG_ACPI) += cros_ec_ obj-$(CONFIG_MFD_CROS_EC) += cros_ec_core.o obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o ++++ +obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o --- --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_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o