From: ccoffing@novell.com
Subject: Retain backwards-compatible module name with CONFIG_XEN_BLKDEV_TAP=m
Patch-mainline: obsolete

--- head-2011-02-17.orig/drivers/xen/blktap/Makefile	2007-06-12 13:13:44.000000000 +0200
+++ head-2011-02-17/drivers/xen/blktap/Makefile	2009-05-29 12:39:04.000000000 +0200
@@ -1,5 +1,5 @@
 LINUXINCLUDE += -I../xen/include/public/io
 
-obj-$(CONFIG_XEN_BLKDEV_TAP) := xenblktap.o
+obj-$(CONFIG_XEN_BLKDEV_TAP) := blktap.o
 
-xenblktap-y := xenbus.o interface.o blktap.o 
+blktap-y := xenbus.o interface.o blocktap.o
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ head-2011-02-17/drivers/xen/blktap/blocktap.c	2009-05-29 12:39:04.000000000 +0200
@@ -0,0 +1 @@
+#include "blktap.c"
--- head-2011-02-17.orig/drivers/xen/blktap2/Makefile	2009-05-29 10:25:53.000000000 +0200
+++ head-2011-02-17/drivers/xen/blktap2/Makefile	2009-05-29 12:39:04.000000000 +0200
@@ -1,3 +1,4 @@
-obj-$(CONFIG_XEN_BLKDEV_TAP2) := blktap.o
+obj-$(CONFIG_XEN_BLKDEV_TAP2) := blktap2.o
 
-blktap-objs := control.o ring.o wait_queue.o device.o request.o sysfs.o
+blktap2-y := control.o ring.o wait_queue.o device.o request.o
+blktap2-$(CONFIG_SYSFS) += sysfs.o
--- head-2011-02-17.orig/drivers/xen/blktap2/blktap.h	2011-02-01 15:03:03.000000000 +0100
+++ head-2011-02-17/drivers/xen/blktap2/blktap.h	2011-02-24 15:24:27.000000000 +0100
@@ -216,10 +216,17 @@ int blktap_ring_pause(struct blktap *);
 int blktap_ring_resume(struct blktap *);
 void blktap_ring_kick_user(struct blktap *);
 
+#ifdef CONFIG_SYSFS
 int blktap_sysfs_init(void);
 void blktap_sysfs_free(void);
 int blktap_sysfs_create(struct blktap *);
 int blktap_sysfs_destroy(struct blktap *);
+#else
+static inline int blktap_sysfs_init(void) { return 0; }
+static inline void blktap_sysfs_exit(void) {}
+static inline int blktap_sysfs_create(struct blktap *tapdev) { return 0; }
+static inline int blktap_sysfs_destroy(struct blktap *tapdev) { return 0; }
+#endif
 
 int blktap_device_init(int *);
 void blktap_device_free(void);