summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-07-11 15:37:55 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-13 16:14:26 +0100
commit5cbc1b6f66313111f64e779bf1df3799bf5c2df8 (patch)
tree312d722d9e151b6630af7b647f18e98d0a045dfc /arch/arm/kernel
parenta9da396a37fb3da5d0f212c41c6e96bcbf8fe590 (diff)
[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 <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/bios32.c11
1 files changed, 0 insertions, 11 deletions
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;