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;