From: Adrian Bunk Date: Tue, 11 Jul 2006 13:37:55 +0000 (+0200) Subject: [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge X-Git-Tag: v2.6.18-rc2~85^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5cbc1b6f66313111f64e779bf1df3799bf5c2df8;p=linux-2.6-omap-h63xx.git [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge Since this assignment was the only place on !alpha where isa_bridge was touched, it didn't have any effect. Signed-off-by: Adrian Bunk Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 964faac104f..240c448ec31 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -370,17 +370,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) features &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY); switch (dev->class >> 8) { -#if defined(CONFIG_ISA) || defined(CONFIG_EISA) - case PCI_CLASS_BRIDGE_ISA: - case PCI_CLASS_BRIDGE_EISA: - /* - * If this device is an ISA bridge, set isa_bridge - * to point at this device. We will then go looking - * for things like keyboard, etc. - */ - isa_bridge = dev; - break; -#endif case PCI_CLASS_BRIDGE_PCI: pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &status); status |= PCI_BRIDGE_CTL_PARITY|PCI_BRIDGE_CTL_MASTER_ABORT;