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.
This commit is contained in:
Linus Torvalds
2012-01-17 11:56:29 -08:00

View File

@@ -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;