diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 13:26:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 13:26:30 -0800 |
| commit | 683fdc5fe5fec5c4f27eb58a8781f212f50c8e01 (patch) | |
| tree | fde848a374c53ff4352e0f9166b4d4eca0582886 | |
| parent | f7f84f38cd916552c175f1f3d09cb6e85c1b29fc (diff) | |
| parent | 0f99fed4606dcbcbe813df831a39fd8f9653ef54 (diff) | |
| download | op-kernel-dev-683fdc5fe5fec5c4f27eb58a8781f212f50c8e01.zip op-kernel-dev-683fdc5fe5fec5c4f27eb58a8781f212f50c8e01.tar.gz | |
Merge branch 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix
| -rw-r--r-- | drivers/base/sys.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index c98c31e..b428c8c 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -303,7 +303,6 @@ void sysdev_unregister(struct sys_device * sysdev) * is guaranteed by virtue of the fact that child devices are registered * after their parents. */ - void sysdev_shutdown(void) { struct sysdev_class * cls; @@ -363,7 +362,6 @@ static void __sysdev_resume(struct sys_device *dev) * This is only called by the device PM core, so we let them handle * all synchronization. */ - int sysdev_suspend(pm_message_t state) { struct sysdev_class * cls; @@ -432,7 +430,7 @@ aux_driver: } return ret; } - +EXPORT_SYMBOL_GPL(sysdev_suspend); /** * sysdev_resume - Bring system devices back to life. @@ -442,7 +440,6 @@ aux_driver: * * Note: Interrupts are disabled when called. */ - int sysdev_resume(void) { struct sysdev_class * cls; @@ -463,7 +460,7 @@ int sysdev_resume(void) } return 0; } - +EXPORT_SYMBOL_GPL(sysdev_resume); int __init system_bus_init(void) { |
