From f6c9bf971ee3c1e0712ebe711e9a678133e74144 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 12 Jan 2012 11:35:50 -0500
Subject: [PATCH] --- yaml --- r: 285940 b: refs/heads/master c:
 8ea11f7f11c811d1f502c2dabc5259d447c2f2a0 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/xen/xen-balloon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad86e1c40a3d..38cb1c6e43b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3b7737f2b70ed2fb7cef985e70d04fb5dee7b7c
+refs/heads/master: 8ea11f7f11c811d1f502c2dabc5259d447c2f2a0
diff --git a/trunk/drivers/xen/xen-balloon.c b/trunk/drivers/xen/xen-balloon.c
index 3832e303c33a..596e6a7b17d6 100644
--- a/trunk/drivers/xen/xen-balloon.c
+++ b/trunk/drivers/xen/xen-balloon.c
@@ -221,7 +221,7 @@ static int register_balloon(struct device *dev)
 {
 	int i, error;
 
-	error = bus_register(&balloon_subsys);
+	error = subsys_system_register(&balloon_subsys, NULL);
 	if (error)
 		return error;