diff --git a/[refs] b/[refs] index 33dc29051eaa..405fc184b3e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff9c351f96168a90d5a8239c350b565059e68be1 +refs/heads/master: 61084d992733e8f87f7278c71cdb93869fad9c17 diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile index 35a1463c72d9..3e2faa0939b2 100644 --- a/trunk/drivers/misc/Makefile +++ b/trunk/drivers/misc/Makefile @@ -49,6 +49,5 @@ obj-y += carma/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_INTEL_MEI) += mei/ -obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o