Commit 00b1d444 authored by Linus Torvalds's avatar 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
...@@ -221,7 +221,7 @@ static int register_balloon(struct device *dev) ...@@ -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) if (error)
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment