aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-13 16:04:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:01:44 -0700
commitc4ca0e9e6de92f46271599db90f4ab006c133441 (patch)
tree5b7db73854ee37f8be05dd5f06ac82bc9984bf3d
parent530cf2070be30831a371b6c7181d15e5976b6fc7 (diff)
Staging: hv: add the Hyper-V virtual bus to the build
Add the Hyper-V virtual bus to the kernel build system. Cc: Hank Janssen <hjanssen@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/hv/Kconfig8
-rw-r--r--drivers/staging/hv/Makefile3
4 files changed, 14 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c1a0ca4c96f..34aa21e1fb3 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -137,5 +137,7 @@ source "drivers/staging/dream/camera/Kconfig"
source "drivers/staging/udlfb/Kconfig"
+source "drivers/staging/hv/Kconfig"
+
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index aa65ed205bb..bc84a0e0a46 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -50,3 +50,4 @@ obj-$(CONFIG_RDC_17F3101X) += pata_rdc/
obj-$(CONFIG_FB_UDL) += udlfb/
obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/
obj-$(CONFIG_MSM_CAMERA) += dream/camera/
+obj-$(CONFIG_HYPERV) += hv/
diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
new file mode 100644
index 00000000000..40d922bfab2
--- /dev/null
+++ b/drivers/staging/hv/Kconfig
@@ -0,0 +1,8 @@
+config HYPERV
+ tristate "Microsoft Hyper-V client drivers"
+ depends on X86
+ default n
+ help
+ Select this option to run Linux as a Hyper-V client operating
+ system.
+
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
new file mode 100644
index 00000000000..9908360345b
--- /dev/null
+++ b/drivers/staging/hv/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
+
+hv_vmbus-objs := vmbus_drv.o osd.o Sources.o