diff --git a/[refs] b/[refs] index 0eaf54bbcddd..b2c90882a16e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99369065970e9ea7d1ca489341ed29d1a72ec0b5 +refs/heads/master: 703860ed4e36ded696bd44af6107243fdedfb746 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 2461033a7987..9587d4d19279 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -249,8 +249,7 @@ struct pci_dev { pci_power_t current_state; /* Current operating state. In ACPI-speak, this is D0-D3, D0 being fully functional, and D3 being off. */ - int pm_cap; /* PM capability offset in the - configuration space */ + u8 pm_cap; /* PM capability offset */ unsigned int pme_support:5; /* Bitmask of states from which PME# can be generated */ unsigned int pme_interrupt:1;