diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /include/linux/pci.h | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
| download | blackbird-op-linux-adbedd34244e2b054557002817f979a9b004a405.tar.gz blackbird-op-linux-adbedd34244e2b054557002817f979a9b004a405.zip | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 7ac14961ba22..8621cf42b46f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -971,6 +971,8 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int en #define isa_bridge ((struct pci_dev *)NULL) +#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) + #else /* @@ -985,9 +987,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) return 0; } #endif - -#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) - #endif /* !CONFIG_PCI */ /* these helpers provide future and backwards compatibility |
