Commit 00b1d444 authored Jan 17, 2012 by Linus Torvalds

Merge branch 'stable/for-linus-fixes-3.3' of...

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.

parents 8364919c 8ea11f7f

drivers/xen/xen-balloon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;