From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750768AbWGKNh5 (ORCPT ); Tue, 11 Jul 2006 09:37:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750770AbWGKNh5 (ORCPT ); Tue, 11 Jul 2006 09:37:57 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:12306 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1750768AbWGKNh4 (ORCPT ); Tue, 11 Jul 2006 09:37:56 -0400 Date: Tue, 11 Jul 2006 15:37:55 +0200 From: Adrian Bunk To: Andrew Morton Cc: rmk@arm.linux.org.uk, linux-kernel@vger.kernel.org Subject: [2.6 patch] arch/arm/kernel/bios32.c: no need to set isa_bridge Message-ID: <20060711133755.GO13938@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- This patch was already sent on: - 1 May 2006 --- linux-2.6.17-rc2-mm1-shark/arch/arm/kernel/bios32.c.old 2006-04-27 23:11:07.000000000 +0200 +++ linux-2.6.17-rc2-mm1-shark/arch/arm/kernel/bios32.c 2006-04-27 23:12:15.000000000 +0200 @@ -371,17 +371,6 @@ 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;