+config XEN_V2V_DEV
+ tristate "Xen V2V device"
+ depends on XEN_V2V
-+ default m
++ default m
+ help
+ Xen V2V char device for userland v2v.
diff --git a/drivers/xen/v2v/Makefile b/drivers/xen/v2v/Makefile
index f3442d9..5230cd6 100644
--- a/drivers/xen/v2v/Makefile
+++ b/drivers/xen/v2v/Makefile
-@@ -1,5 +1,6 @@
+@@ -1,8 +1,9 @@
- obj-$(CONFIG_XEN_V2V) += v2v.o v2vutl.o
- obj-$(CONFIG_XEN_V2V_DRV) += v2vdrv.o v2vops.o
+ v2vdrv-objs =
+ v2vdrv-objs += v2vsamp.o v2vops.o
+obj-$(CONFIG_XEN_V2V_DEV) += v2vdev.o
ccflags-$(CONFIG_XEN_V2V_DEBUG) += -DDEBUG