diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 2 | ||||
-rw-r--r-- | include/linux/pci_regs.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 830c1bae56cc..8878ccff9e3c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -384,7 +384,9 @@ int pci_set_mwi(struct pci_dev *dev); | |||
384 | void pci_clear_mwi(struct pci_dev *dev); | 384 | void pci_clear_mwi(struct pci_dev *dev); |
385 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); | 385 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); |
386 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); | 386 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); |
387 | void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); | ||
387 | int pci_assign_resource(struct pci_dev *dev, int i); | 388 | int pci_assign_resource(struct pci_dev *dev, int i); |
389 | void pci_restore_bars(struct pci_dev *dev); | ||
388 | 390 | ||
389 | /* ROM control related routines */ | 391 | /* ROM control related routines */ |
390 | void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size); | 392 | void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size); |
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index 7dc391cad10d..e2a089b051ed 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h | |||
@@ -222,6 +222,7 @@ | |||
222 | #define PCI_PM_CAP_PME_D3cold 0x8000 /* PME# from D3 (cold) */ | 222 | #define PCI_PM_CAP_PME_D3cold 0x8000 /* PME# from D3 (cold) */ |
223 | #define PCI_PM_CTRL 4 /* PM control and status register */ | 223 | #define PCI_PM_CTRL 4 /* PM control and status register */ |
224 | #define PCI_PM_CTRL_STATE_MASK 0x0003 /* Current power state (D0 to D3) */ | 224 | #define PCI_PM_CTRL_STATE_MASK 0x0003 /* Current power state (D0 to D3) */ |
225 | #define PCI_PM_CTRL_NO_SOFT_RESET 0x0004 /* No reset for D3hot->D0 */ | ||
225 | #define PCI_PM_CTRL_PME_ENABLE 0x0100 /* PME pin enable */ | 226 | #define PCI_PM_CTRL_PME_ENABLE 0x0100 /* PME pin enable */ |
226 | #define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00 /* Data select (??) */ | 227 | #define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00 /* Data select (??) */ |
227 | #define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000 /* Data scale (??) */ | 228 | #define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000 /* Data scale (??) */ |