Merge tag 'stable/for-linus-3.4-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[~shefty/rdma-dev.git] / drivers / xen / xen-balloon.c
index 3f7922ec13e3d5ecabf46bf01dd48979e1a960a3..8f37e23f6d139ec1e46577eeaa6a599bba3b26eb 100644 (file)
@@ -221,7 +221,7 @@ static int register_balloon(struct device *dev)
 {
        int i, error;
 
 {
        int i, error;
 
-       error = bus_register(&balloon_subsys);
+       error = subsys_system_register(&balloon_subsys, NULL);
        if (error)
                return error;
 
        if (error)
                return error;