Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbc1b6f authored by Adrian Bunk's avatar Adrian Bunk Committed by Russell King
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a9da396a
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -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;