diff --git a/[refs] b/[refs] index 0bf1d501a313..64af3492ec1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ab47050453c10da13940114dea9c7f1c6ad323f +refs/heads/master: 7199677d2e919edc75d1fb8856c98cd0c1bbcfc5 diff --git a/trunk/drivers/base/driver.c b/trunk/drivers/base/driver.c index ba75184c653c..bf31a0170a48 100644 --- a/trunk/drivers/base/driver.c +++ b/trunk/drivers/base/driver.c @@ -120,6 +120,9 @@ EXPORT_SYMBOL_GPL(driver_remove_file); /** * driver_add_kobj - add a kobject below the specified driver + * @drv: requesting device driver + * @kobj: kobject to add below this driver + * @fmt: format string that names the kobject * * You really don't want to do this, this is only here due to one looney * iseries driver, go poke those developers if you are annoyed about diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index bdc03f7e8424..d6095608465a 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -523,6 +523,7 @@ static void lock_all_devices(void) /** * device_suspend - Save state and stop all devices in system. + * @state: new power management state * * Prevent new devices from being registered, then lock all devices * and suspend them.