---

yaml --- r: 336970 b: refs/heads/master c: 9aa8b50 h: refs/heads/master v: v3
git-mirror · Nov 15, 2012 · 3bfe2a0 · 3bfe2a0
1 parent 468c171
commit 3bfe2a0
Show file tree

Hide file tree

Showing 4 changed files with 1,049 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 997071bcb34005f42e0fe5bc7930e895b070f251
+refs/heads/master: 9aa8b50b2b3d3a70728438a15a0fdd03a6794a84
diff --git a/trunk/drivers/hv/Kconfig b/trunk/drivers/hv/Kconfig
@@ -13,4 +13,10 @@ config HYPERV_UTILS
 	help
 	  Select this option to enable the Hyper-V Utilities.
 
+config HYPERV_BALLOON
+	tristate "Microsoft Hyper-V Balloon driver"
+	depends on HYPERV
+	help
+	  Select this option to enable Hyper-V Balloon driver.
+
 endmenu
diff --git a/trunk/drivers/hv/Makefile b/trunk/drivers/hv/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_HYPERV)		+= hv_vmbus.o
 obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
+obj-$(CONFIG_HYPERV_BALLOON)	+= hv_balloon.o
 
 hv_vmbus-y := vmbus_drv.o \
 		 hv.o connection.o channel.o \