diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 14:56:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 14:56:29 -0500 |
| commit | 00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0 (patch) | |
| tree | e2221c08271cd4413f191532a957cb0e7b2a525b /drivers/xen | |
| parent | 8364919c5698d934860aabc607ffd32b13c8c37c (diff) | |
| parent | 8ea11f7f11c811d1f502c2dabc5259d447c2f2a0 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c index 3832e303c33a..596e6a7b17d6 100644 --- a/drivers/xen/xen-balloon.c +++ b/drivers/xen/xen-balloon.c | |||
| @@ -221,7 +221,7 @@ static int register_balloon(struct device *dev) | |||
| 221 | { | 221 | { |
| 222 | int i, error; | 222 | int i, error; |
| 223 | 223 | ||
| 224 | error = bus_register(&balloon_subsys); | 224 | error = subsys_system_register(&balloon_subsys, NULL); |
| 225 | if (error) | 225 | if (error) |
| 226 | return error; | 226 | return error; |
| 227 | 227 | ||