diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-07-11 09:37:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-13 11:14:26 -0400 |
commit | 5cbc1b6f66313111f64e779bf1df3799bf5c2df8 (patch) | |
tree | 312d722d9e151b6630af7b647f18e98d0a045dfc | |
parent | a9da396a37fb3da5d0f212c41c6e96bcbf8fe590 (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>
-rw-r--r-- | arch/arm/kernel/bios32.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 964faac104fb..240c448ec31c 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) | |||
370 | features &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY); | 370 | features &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY); |
371 | 371 | ||
372 | switch (dev->class >> 8) { | 372 | switch (dev->class >> 8) { |
373 | #if defined(CONFIG_ISA) || defined(CONFIG_EISA) | ||
374 | case PCI_CLASS_BRIDGE_ISA: | ||
375 | case PCI_CLASS_BRIDGE_EISA: | ||
376 | /* | ||
377 | * If this device is an ISA bridge, set isa_bridge | ||
378 | * to point at this device. We will then go looking | ||
379 | * for things like keyboard, etc. | ||
380 | */ | ||
381 | isa_bridge = dev; | ||
382 | break; | ||
383 | #endif | ||
384 | case PCI_CLASS_BRIDGE_PCI: | 373 | case PCI_CLASS_BRIDGE_PCI: |
385 | pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &status); | 374 | pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &status); |
386 | status |= PCI_BRIDGE_CTL_PARITY|PCI_BRIDGE_CTL_MASTER_ABORT; | 375 | status |= PCI_BRIDGE_CTL_PARITY|PCI_BRIDGE_CTL_MASTER_ABORT; |