summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-17 11:56:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-17 11:56:29 -0800
commit00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0 (patch)
treee2221c08271cd4413f191532a957cb0e7b2a525b /drivers/xen
parent8364919c5698d934860aabc607ffd32b13c8c37c (diff)
parent8ea11f7f11c811d1f502c2dabc5259d447c2f2a0 (diff)
downloadlinux-3.10-00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0.tar.gz
linux-3.10-00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0.tar.bz2
linux-3.10-00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0.zip
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.
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xen-balloon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c
index 3832e303c33..596e6a7b17d 100644
--- 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;