diff --git a/[refs] b/[refs] index 991693a3e43e..770da04dce6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96bde06a2df1b363206d3cdef53134b84ff37813 +refs/heads/master: 0da0ead90122578ef6e4afba9ba4bcd3455fd8e8 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 3aba02a04792..99d45751830c 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -744,6 +744,9 @@ static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state) { static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; } static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; } +static inline int pci_request_regions(struct pci_dev *dev, const char *res_name) { return -EIO; } +static inline void pci_release_regions(struct pci_dev *dev) { } + #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) static inline void pci_block_user_cfg_access(struct pci_dev *dev) { }