Merge tag 'lsk-v3.10-15.04-android'

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

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 89435c9a182c4d348cab3cf9424d46f03179173f..fae4038627fb53d15436de23ea82db7717e220a0 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -53,5 +53,8 @@ obj-$(CONFIG_ALTERA_STAPL)    +=altera-stapl/
 obj-$(CONFIG_INTEL_MEI)                += mei/
 obj-$(CONFIG_VMWARE_VMCI)      += vmw_vmci/
 obj-$(CONFIG_LATTICE_ECP3_CONFIG)      += lattice-ecp3-config.o
+obj-y += inv_mpu/
 obj-$(CONFIG_SRAM)             += sram.o
 obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o
+
+obj-$(CONFIG_5V_EN)    += 5v_en.o