summaryrefslogtreecommitdiff
path: root/drivers/misc/Makefile
diff options
context:
space:
mode:
authorGeorge Zhang <georgezhang@vmware.com>2013-01-08 15:55:59 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 16:15:57 -0800
commit20259849bb1ac1ffb0156eb359810e8b99cb644d (patch)
treef992fdf9979ddd38cd620240a19cc0e013437fd8 /drivers/misc/Makefile
parent8bf503991f87e32ea42a7bd69b79ba084fddc5d7 (diff)
downloadlinux-3.10-20259849bb1ac1ffb0156eb359810e8b99cb644d.tar.gz
linux-3.10-20259849bb1ac1ffb0156eb359810e8b99cb644d.tar.bz2
linux-3.10-20259849bb1ac1ffb0156eb359810e8b99cb644d.zip
VMCI: Some header and config files.
VMCI head config patch Adds all the necessary files to enable building of the VMCI module with the Linux Makefiles and Kconfig systems. Also adds the header files used for building modules against the driver. Signed-off-by: George Zhang <georgezhang@vmware.com> Acked-by: Andy king <acking@vmware.com> Acked-by: Dmitry Torokhov <dtor@vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r--drivers/misc/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 2129377c0de..5c99726dd61 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -49,3 +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/