diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:45 -0800 |
| commit | a0d2db26582a67b61f883d1469e561fbdef28419 (patch) | |
| tree | e8a4a0bdd1f12fd127d132f1901cee813b06517d | |
| parent | ced3985faebc232deec0dd9cc375cb5a43d18391 (diff) | |
| parent | bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 (diff) | |
| download | linux-a0d2db26582a67b61f883d1469e561fbdef28419.tar.gz linux-a0d2db26582a67b61f883d1469e561fbdef28419.tar.bz2 linux-a0d2db26582a67b61f883d1469e561fbdef28419.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN
PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"
| -rw-r--r-- | arch/i386/pci/common.c | 1 | ||||
| -rw-r--r-- | arch/i386/pci/i386.c | 9 | ||||
| -rw-r--r-- | arch/i386/pci/pci.h | 1 | ||||
| -rw-r--r-- | drivers/pci/Kconfig | 2 |
4 files changed, 1 insertions, 12 deletions
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c index 6d5ace845e44..cdfcf971098b 100644 --- a/arch/i386/pci/common.c +++ b/arch/i386/pci/common.c @@ -343,7 +343,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) void pcibios_disable_device (struct pci_dev *dev) { - pcibios_disable_resources(dev); if (pcibios_disable_irq) pcibios_disable_irq(dev); } diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c index 10154a2cac68..98580292f0d4 100644 --- a/arch/i386/pci/i386.c +++ b/arch/i386/pci/i386.c @@ -242,15 +242,6 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) return 0; } -void pcibios_disable_resources(struct pci_dev *dev) -{ - u16 cmd; - - pci_read_config_word(dev, PCI_COMMAND, &cmd); - cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY); - pci_write_config_word(dev, PCI_COMMAND, cmd); -} - /* * If we set up a device for bus mastering, we need to check the latency * timer as certain crappy BIOSes forget to set it properly. diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index ad065cebd7b9..a0a25180b61a 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h @@ -43,7 +43,6 @@ extern unsigned int pcibios_max_latency; void pcibios_resource_survey(void); int pcibios_enable_resources(struct pci_dev *, int); -void pcibios_disable_resources(struct pci_dev *); /* pci-pc.c */ diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index ecc50db8585a..5f1b9f58070e 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -19,7 +19,7 @@ config PCI_MSI config PCI_MULTITHREAD_PROBE bool "PCI Multi-threaded probe (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + depends on PCI && EXPERIMENTAL && BROKEN help Say Y here if you want the PCI core to spawn a new thread for every PCI device that is probed. This can cause a huge |