The patch titled arch/arm/kernel/bios32.c: no need to set isa_bridge has been added to the -mm tree. Its filename is arch-arm-kernel-bios32c-no-need-to-set-isa_bridge.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: arch/arm/kernel/bios32.c: no need to set isa_bridge From: Adrian Bunk <bunk@xxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/arm/kernel/bios32.c | 11 ----------- 1 files changed, 11 deletions(-) diff -puN arch/arm/kernel/bios32.c~arch-arm-kernel-bios32c-no-need-to-set-isa_bridge arch/arm/kernel/bios32.c --- a/arch/arm/kernel/bios32.c~arch-arm-kernel-bios32c-no-need-to-set-isa_bridge +++ a/arch/arm/kernel/bios32.c @@ -370,17 +370,6 @@ void __devinit pcibios_fixup_bus(struct 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; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-alsa.patch make-sound-isa-gus-gusextremecdevices-static.patch arch-arm-kernel-bios32c-no-need-to-set-isa_bridge.patch git-cpufreq.patch git-gfs2.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch git-mtd.patch drivers-net-e1000-possible-cleanups.patch fs-nfs-make-2-functions-static.patch fs-nfs-make-code-static.patch git-pcmcia.patch include-scsi-libsash-should-include-linux-scatterlisth.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch git-scsi-rc-fixes.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-arcmsr-cleanups.patch areca-raid-linux-scsi-driver-update7-fix-2.patch mm-make-functions-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch reiserfs-warn-about-the-useless-nolargeio-option.patch x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch null-terminate-over-long-proc-kallsyms-symbols-fix.patch remove-kernel-kthreadckthread_stop_sem.patch task-watchers-register-semundo-task-watcher.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-sysctl-hack-fix.patch namespaces-utsname-implement-clone_newuts-flag.patch fs-reiser4-possible-cleanups.patch srcu-3-add-srcu-operations-to-rcutorture-fix.patch the-scheduled-removal-of-some-oss-drivers.patch the-scheduled-removal-of-some-oss-drivers-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html