]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
[ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
authorAdrian Bunk <bunk@stusta.de>
Tue, 11 Jul 2006 13:37:55 +0000 (15:37 +0200)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 Jul 2006 15:14:26 +0000 (16:14 +0100)
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>
arch/arm/kernel/bios32.c

index 964faac104fb05a51b96e2de0be2137d30df6594..240c448ec31cf15a40222d2ab8e9414fc65bf7b6 100644 (file)
@@ -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;