diff --git a/[refs] b/[refs] index 5d0e24065ed2..983c89c9da15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72a73693aac5ae82850cedc69fa5d264ca977c13 +refs/heads/master: 443bd1c4ddab9d2144f4c9b85e0abccf2d93423f diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 44a46c92b721..d00f0e0d8453 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1123,8 +1123,7 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) } /** - * pci_prepare_to_sleep - prepare PCI device for system-wide transition into - * a sleep state + * pci_prepare_to_sleep - prepare PCI device for system-wide transition into a sleep state * @dev: Device to handle. * * Choose the power state appropriate for the device depending on whether @@ -1181,8 +1180,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev) } /** - * pci_back_from_sleep - turn PCI device on during system-wide transition into - * the working state a sleep state + * pci_back_from_sleep - turn PCI device on during system-wide transition into working state * @dev: Device to handle. * * Disable device's sytem wake-up capability and put it into D0.