diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/base/sys.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'drivers/base/sys.c')
| -rw-r--r-- | drivers/base/sys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index f6fb5474160..fbe72da6c41 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c | |||
| @@ -329,7 +329,7 @@ void sysdev_unregister(struct sys_device *sysdev) | |||
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | 331 | ||
| 332 | 332 | #ifndef CONFIG_ARCH_NO_SYSDEV_OPS | |
| 333 | /** | 333 | /** |
| 334 | * sysdev_shutdown - Shut down all system devices. | 334 | * sysdev_shutdown - Shut down all system devices. |
| 335 | * | 335 | * |
| @@ -524,6 +524,7 @@ int sysdev_resume(void) | |||
| 524 | return 0; | 524 | return 0; |
| 525 | } | 525 | } |
| 526 | EXPORT_SYMBOL_GPL(sysdev_resume); | 526 | EXPORT_SYMBOL_GPL(sysdev_resume); |
| 527 | #endif /* CONFIG_ARCH_NO_SYSDEV_OPS */ | ||
| 527 | 528 | ||
| 528 | int __init system_bus_init(void) | 529 | int __init system_bus_init(void) |
| 529 | { | 530 | { |