From: Kumar Gala <galak@freescale.com>
Date: Fri, 29 Jul 2005 19:16:27 +0000 (-0700)
Subject: [PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?
X-Git-Tag: v2.6.13-rc5~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a46e812620bd7db457ce002544a1a6572c313d8a;p=linux-2.6

[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>
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7ac14961ba..8621cf42b4 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