diff --git a/[refs] b/[refs] index 113f08f7c8ca..7cf363b58f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f4338ca8534823bc6c843edbbe42fd4e73d258 +refs/heads/master: a46e812620bd7db457ce002544a1a6572c313d8a diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 7ac14961ba22..8621cf42b46f 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/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