aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-21 09:36:07 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-21 09:36:07 -0400
commit5bba6c56dc99ff88f79a79572e29ecf445710878 (patch)
tree5eff54c5e2c0d4700cd907db6733b1c5b7415429
parent2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1 (diff)
downloadmrst-s0i3-test-5bba6c56dc99ff88f79a79572e29ecf445710878.tar.gz
mrst-s0i3-test-5bba6c56dc99ff88f79a79572e29ecf445710878.tar.xz
mrst-s0i3-test-5bba6c56dc99ff88f79a79572e29ecf445710878.zip
X86/PCI: Remove the dependency on isapnp_disable.
This looks to be vestigial dependency that had never been used even in the original code base (2.6.18) from which this driver was up-ported. Without this fix, with the CONFIG_ISAPNP, we get this compile failure: arch/x86/pci/xen.c: In function 'pci_xen_init': arch/x86/pci/xen.c:138: error: 'isapnp_disable' undeclared (first use in this function) arch/x86/pci/xen.c:138: error: (Each undeclared identifier is reported only once arch/x86/pci/xen.c:138: error: for each function it appears in.) Reported-by: Li Zefan <lizf@cn.fujitsu.com> Tested-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/pci/xen.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index b19c873d8d0..4e371065ce4 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -133,11 +133,6 @@ int __init pci_xen_init(void)
acpi_noirq = 1;
#endif
-#ifdef CONFIG_ISAPNP
- /* Stop isapnp from probing */
- isapnp_disable = 1;
-#endif
-
#ifdef CONFIG_PCI_MSI
x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
x86_msi.teardown_msi_irq = xen_teardown_msi_irq;