The patch titled remove additional pci_scan_child_bus() prototype has been added to the -mm tree. Its filename is remove-additional-pci_scan_child_bus-prototype.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: remove additional pci_scan_child_bus() prototype From: Adrian Bunk <bunk@xxxxxxxxxx> There's already a prototype for pci_scan_child_bus() at the correct place in pci.h, so there's no reason for an additional one. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pci/probe.c | 2 -- 1 file changed, 2 deletions(-) diff -puN drivers/pci/probe.c~remove-additional-pci_scan_child_bus-prototype drivers/pci/probe.c --- a/drivers/pci/probe.c~remove-additional-pci_scan_child_bus-prototype +++ a/drivers/pci/probe.c @@ -477,8 +477,6 @@ static void pci_fixup_parent_subordinate } } -unsigned int pci_scan_child_bus(struct pci_bus *bus); - /* * If it's a bridge, configure it and scan the bus behind it. * For CardBus bridges, we don't scan behind as the devices will _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are lguest_userc-fix-memory-leak.patch video-sis-fix-negative-array-index.patch git-avr32.patch git-dvb.patch git-hwmon.patch git-gfs2-nmw.patch git-mtd.patch git-net.patch make-sunrpc-xprtsockcxs_setup_udptcp-static.patch git-netdev-all.patch drivers-net-chelsio-if-0-unused-functions.patch drivers-bluetooth-bpa10xc-fix-memleak.patch drivers-bluetooth-btsdioc-fix-double-free.patch git-nfs-make-nfs_wb_page_priority-static.patch fs-nfs-dirc-should-include-internalh.patch git-ocfs2.patch proper-prototype-for-kernel-schedcmigration_init.patch git-scsi-misc.patch scsi-advansysc-make-3-functions-static.patch scsi-qla2xxx-possible-cleanups.patch usb-mon-mon_binc-cleanups.patch xtensa-iss_net_setup-must-be-__init.patch xtensa-kernel-setupc-remove-dead-code.patch sunrpc-xprtrdma-transportc-fix-use-after-free.patch fix-mm-utilckrealloc.patch fuse_file_alloc-fix-null-dereferences.patch pidns-place-under-config_experimental.patch pidns-place-under-config_experimental-checkpatch-fixes.patch feature-removal-schedule-remove-sa_-flags-entry.patch kernel-taskstatsc-fix-bogus-nlmsg_free.patch mm-hugetlbc-make-a-function-static.patch mm-page-writebackc-make-a-function-static.patch make-__vmalloc_area_node-static.patch blackfin-remove-dump_thread.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch kernel-power-move-function-prototypes-to-header.patch kill-udffs_dateversion.patch make-ipc-utilcsysvipc_find_ipc-static.patch cleanup-after-apus-removal.patch remove-mm_ptovvtop.patch remove-__attribute_used__.patch remove-__attribute_used__-checkpatch-fixes.patch proper-show_interrupts-prototype.patch scheduled-oss-driver-removal.patch linux-inith-simplify-__meminitexit-dependencies.patch proper-prototype-for-signals_init.patch kernel-ptracec-should-include-linux-syscallsh.patch make-srcu_readers_active-static.patch kernel-notifierc-should-include-linux-rebooth.patch proper-prototype-for-get_filesystem_list.patch fs-utimesc-should-include-linux-syscallsh.patch fs-signalfdc-should-include-linux-syscallsh.patch fs-eventfdc-should-include-linux-syscallsh.patch proper-prototype-for-vty_init.patch drivers-misc-lkdtmc-cleanups.patch power_supply_ledssysfsc-should-include-power_supplyh.patch fs-ecryptfs-possible-cleanups.patch make-video-geode-lxfb_corecgeode_modedb-static.patch video-hpfbc-section-fix.patch ext4-superc-fix-ifdefs.patch make-jbd-journalc__journal_abort_hard-static.patch move-edactxt-two-levels-up.patch remove-documentation-smptxt.patch kernel-cgroupc-remove-dead-code.patch kernel-cgroupc-make-2-functions-static.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch fix-m32r-__xchg.patch reiser4.patch remove-references-to-net-modulestxt.patch blk_dev_idecd-help-remove-outdated-note.patch always-export-pci_scan_single_device.patch x86-acpi_pciprobe_dmi_table-must-be-__devinitdata.patch remove-additional-pci_scan_child_bus-prototype.patch remove-saa7134-oss.patch x86_64-remove-acpi_pci_link_exit.patch x86-mce_64c-make-struct-mcelog-static.patch x86-e820_64c-make-2-functions-static.patch x86-nmi_64c-make-code-static.patch x86-pci-calgary_64c-make-a-variable-static.patch x86-pci-dma_64c-cleanups.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