diff --git a/[refs] b/[refs]
index d546f78accfb..9fd44a9ea802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38fadc3e1f2ed55544acb75823ba7b2929597f68
+refs/heads/master: b9bd2f9b358613fb697c849a5300f890db54fbcf
diff --git a/trunk/drivers/staging/hv/vmbus.h b/trunk/drivers/staging/hv/vmbus.h
index 42f2adb99547..8bcfb40a24fa 100644
--- a/trunk/drivers/staging/hv/vmbus.h
+++ b/trunk/drivers/staging/hv/vmbus.h
@@ -33,14 +33,6 @@ struct driver_context {
 
 	struct device_driver driver;
 
-	/*
-	 * Use these methods instead of the struct device_driver so 2.6 kernel
-	 * stops complaining
-	 * TODO - fix this!
-	 */
-	int (*probe)(struct device *);
-	int (*remove)(struct device *);
-	void (*shutdown)(struct device *);
 };
 
 struct vm_device {