diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-15 11:24:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-15 14:12:38 -0400 |
| commit | 61084d992733e8f87f7278c71cdb93869fad9c17 (patch) | |
| tree | 568c8b861de78324f9d0903be35c4d9bb8bee665 /drivers/misc/Makefile | |
| parent | ff9c351f96168a90d5a8239c350b565059e68be1 (diff) | |
misc: Remove max8997-muic.o Makefile line again
Commit 20259849bb1ac1ffb0156eb359810e8b99cb644d ("VMCI: Some header and
config files.") readded this Makefile line. Remove it again.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 35a1463c72d9..3e2faa0939b2 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -49,6 +49,5 @@ obj-y += carma/ | |||
| 49 | obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o | 49 | obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o |
| 50 | obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ | 50 | obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ |
| 51 | obj-$(CONFIG_INTEL_MEI) += mei/ | 51 | obj-$(CONFIG_INTEL_MEI) += mei/ |
| 52 | obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o | ||
| 53 | obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ | 52 | obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ |
| 54 | obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o | 53 | obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o |