diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-31 13:06:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 15:00:45 -0500 |
commit | 5b889bf237fca383b5807ad69fde3ad1e2287e42 (patch) | |
tree | 91c1df6fe04a187d31b62d96b1aa70abf3e04710 /drivers/pci/pci.c | |
parent | 9de54606d3d55095e4426a81a79a41d8e5e5b6be (diff) |
PCI: Fix build if quirks are not enabled
After commit b9c3b266411d27f1a6466c19d146d08db576bfea ("PCI: support
device-specific reset methods") the kernel build is broken if
CONFIG_PCI_QUIRKS is unset.
Fix this by moving pci_dev_specific_reset() to drivers/pci/quirks.c and
providing an empty replacement for !CONFIG_PCI_QUIRKS builds.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 864e703cf737..0906599ebfde 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -2284,21 +2284,6 @@ static int pci_parent_bus_reset(struct pci_dev *dev, int probe) | |||
2284 | return 0; | 2284 | return 0; |
2285 | } | 2285 | } |
2286 | 2286 | ||
2287 | static int pci_dev_specific_reset(struct pci_dev *dev, int probe) | ||
2288 | { | ||
2289 | struct pci_dev_reset_methods *i; | ||
2290 | |||
2291 | for (i = pci_dev_reset_methods; i->reset; i++) { | ||
2292 | if ((i->vendor == dev->vendor || | ||
2293 | i->vendor == (u16)PCI_ANY_ID) && | ||
2294 | (i->device == dev->device || | ||
2295 | i->device == (u16)PCI_ANY_ID)) | ||
2296 | return i->reset(dev, probe); | ||
2297 | } | ||
2298 | |||
2299 | return -ENOTTY; | ||
2300 | } | ||
2301 | |||
2302 | static int pci_dev_reset(struct pci_dev *dev, int probe) | 2287 | static int pci_dev_reset(struct pci_dev *dev, int probe) |
2303 | { | 2288 | { |
2304 | int rc; | 2289 | int rc; |