diff options
author | Kumar Gala <galak@freescale.com> | 2005-07-29 15:16:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 16:12:52 -0400 |
commit | a46e812620bd7db457ce002544a1a6572c313d8a (patch) | |
tree | d0612d80c5b7c1eab17c28c183e06906c9b1b7f3 | |
parent | 10f4338ca8534823bc6c843edbbe42fd4e73d258 (diff) |
[PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?
In the patch from:
http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html
Is the the following line suppose inside the if CONFIG_PCI=n
#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-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 | |||
971 | 971 | ||
972 | #define isa_bridge ((struct pci_dev *)NULL) | 972 | #define isa_bridge ((struct pci_dev *)NULL) |
973 | 973 | ||
974 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) | ||
975 | |||
974 | #else | 976 | #else |
975 | 977 | ||
976 | /* | 978 | /* |
@@ -985,9 +987,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
985 | return 0; | 987 | return 0; |
986 | } | 988 | } |
987 | #endif | 989 | #endif |
988 | |||
989 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) | ||
990 | |||
991 | #endif /* !CONFIG_PCI */ | 990 | #endif /* !CONFIG_PCI */ |
992 | 991 | ||
993 | /* these helpers provide future and backwards compatibility | 992 | /* these helpers provide future and backwards compatibility |