diff --git a/[refs] b/[refs] index 7399d88cd833..cf5e32d0e2a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb20698d46bac1b2b48cfe1fcb33e54ac885946a +refs/heads/master: 65151365ad59af00e229d0fe33b4f1f9350c685f diff --git a/trunk/drivers/base/sys.c b/trunk/drivers/base/sys.c index 75dd6e22faff..3ca9c5e8d765 100644 --- a/trunk/drivers/base/sys.c +++ b/trunk/drivers/base/sys.c @@ -355,7 +355,7 @@ static void __sysdev_resume(struct sys_device *dev) * sysdev_suspend - Suspend all system devices. * @state: Power state to enter. * - * We perform an almost identical operation as sys_device_shutdown() + * We perform an almost identical operation as sysdev_shutdown() * above, though calling ->suspend() instead. Interrupts are disabled * when this called. Devices are responsible for both saving state and * quiescing or powering down the device. @@ -437,7 +437,7 @@ int sysdev_suspend(pm_message_t state) /** * sysdev_resume - Bring system devices back to life. * - * Similar to sys_device_suspend(), but we iterate the list forwards + * Similar to sysdev_suspend(), but we iterate the list forwards * to guarantee that parent devices are resumed before their children. * * Note: Interrupts are disabled when called.