Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub…

…/scm/linux/kernel/git/konrad/xen * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/balloon: Move the registration from device to subsystem.
mariux64 · Jan 17, 2012 · 00b1d44 · 00b1d44
2 parents 8364919 + 8ea11f7
commit 00b1d44
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/xen/xen-balloon.c b/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;