summaryrefslogtreecommitdiffstats
path: root/drivers/misc/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@vmware.com>2010-09-22 22:04:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 02:22:38 +0200
commitd544b7a40ad3423676b8876aad64fc5f87296b2d (patch)
treef08302b1ce132a71aa8702841846a94ef8e999f3 /drivers/misc/Makefile
parentarm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices" (diff)
downloadlinux-d544b7a40ad3423676b8876aad64fc5f87296b2d.tar.xz
linux-d544b7a40ad3423676b8876aad64fc5f87296b2d.zip
vmware balloon: rename module
In an effort to minimize customer confusion we want to unify naming convention for VMware-provided kernel modules. This change renames the balloon driver from vmware_ballon to vmw_balloon. We expect to follow this naming convention (vmw_<module_name>) for all modules that are part of mainline kernel and/or being distributed by VMware, with the sole exception of vmxnet3 driver (since the name of mainline driver happens to match with the name used in VMware Tools). Signed-off-by: Dmitry Torokhov <dtor@vmware.com> Acked-by: Bhavesh Davda <bhavesh@vmware.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r--drivers/misc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 255a80dc9d73..42eab95cde2a 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -33,5 +33,5 @@ obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/
obj-$(CONFIG_HMC6352) += hmc6352.o
obj-y += eeprom/
obj-y += cb710/
-obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o
+obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o