From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Sun, 1 Apr 2007 17:13:58 +0000 (+0400)
Subject: PCI: define pci_request/release_regions() for CONFIG_PCI=n
X-Git-Tag: v2.6.22-rc1~1039^2~47
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da0ead90122578ef6e4afba9ba4bcd3455fd8e8;p=linux-2.6

PCI: define pci_request/release_regions() for CONFIG_PCI=n

Balance declarations of pci_request_regions() and pci_release_regions() with
empty inline definitions for the CONFIG_PCI=n case -- otherwise my patch to
drivers/net/3c59x.c in the -mm tree doesn't compile. :-)

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 3aba02a047..99d4575183 100644
--- a/include/linux/pci.h
+++ b/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) { }