diff --git a/[refs] b/[refs]
index ade11ab9b376..4724ffac8632 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8770b2683f9f98d4c1d6caf2e28f625592bba4f3
+refs/heads/master: e7579a99b598f8e4a2b4df4854fbda2cc961bb02
diff --git a/trunk/drivers/xen/blkback/Makefile b/trunk/drivers/xen/blkback/Makefile
index 8bab63da3b3e..f1ae1ff07a4d 100644
--- a/trunk/drivers/xen/blkback/Makefile
+++ b/trunk/drivers/xen/blkback/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
+obj-$(CONFIG_XEN_BLKDEV_BACKEND) := xen-blkback.o
 
-blkbk-y	:= blkback.o xenbus.o interface.o vbd.o
+xen-blkback-y	:= blkback.o xenbus.o interface.o vbd.o