The patch titled drivers/mtd/ubi/vtbl.c: make 2 functions static has been removed from the -mm tree. Its filename was drivers-mtd-ubi-vtblc-make-2-functions-static.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/mtd/ubi/vtbl.c: make 2 functions static From: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: Artem Bityutskiy <dedekind@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/mtd/ubi/vtbl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff -puN drivers/mtd/ubi/vtbl.c~drivers-mtd-ubi-vtblc-make-2-functions-static drivers/mtd/ubi/vtbl.c --- a/drivers/mtd/ubi/vtbl.c~drivers-mtd-ubi-vtblc-make-2-functions-static +++ a/drivers/mtd/ubi/vtbl.c @@ -178,8 +178,8 @@ int ubi_vtbl_set_corrupted(const struct return 0; } -const struct ubi_vtbl_vtr *get_ivol_vtr(const struct ubi_info *ubi, - int vol_id); +static const struct ubi_vtbl_vtr *get_ivol_vtr(const struct ubi_info *ubi, + int vol_id); const struct ubi_vtbl_vtr *ubi_vtbl_get_vtr(const struct ubi_info *ubi, int vol_id) @@ -237,7 +237,7 @@ static int __init check_scanning_info(co static void __exit free_volume_info(const struct ubi_info *ubi); -void __init init_ivols(struct ubi_info *ubi); +static void __init init_ivols(struct ubi_info *ubi); int __init ubi_vtbl_init_scan(struct ubi_info *ubi, struct ubi_scan_info *si) { @@ -778,7 +778,7 @@ write_error: * This function initializes information about internal UBI volumes. This * information is not stored on flash but instead, is kept only in RAM. */ -void __init init_ivols(struct ubi_info *ubi) +static void __init init_ivols(struct ubi_info *ubi) { struct ubi_vtbl_vtr *vtr; struct ubi_vtbl_info *vtbl = ubi->vtbl; @@ -818,8 +818,8 @@ void __init init_ivols(struct ubi_info * * This function returns a pointer to the volume tabe record. The @vol_id must * be correct. */ -const struct ubi_vtbl_vtr *get_ivol_vtr(const struct ubi_info *ubi, - int vol_id) +static const struct ubi_vtbl_vtr *get_ivol_vtr(const struct ubi_info *ubi, + int vol_id) { ubi_assert(ubi_is_ivol(vol_id)); return &ubi->vtbl->ivol_vtrs[vol_id - UBI_INTERNAL_VOL_START]; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-acpi.patch git-alsa.patch cpu_freq_table-shouldnt-be-a-def_tristate.patch drivers-char-drm-drm_mmc-remove-unused-exports.patch git-dvb.patch git-gfs2-nmw.patch ia64-add-pci_get_legacy_ide_irq.patch git-ieee1394.patch git-libata-all.patch mips-remove-smp_tune_scheduling.patch git-mmc.patch git-mtd.patch git-ubi.patch git-netdev-all.patch net-irda-proper-prototypes.patch net-wanrouter-wanmainc-cleanups.patch net-uninline-skb_put-fix.patch git-ocfs2.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch drivers-scsi-wd33c93c-cleanups.patch usb_rtl8150-must-select-mii.patch x86_64-re-add-a-newline-to-restore_context.patch lumpy-reclaim-cleanup.patch remove-include-linux-byteorder-pdp_endianh.patch toshiba-tc86c001-ide-driver-take-2-fix.patch toshiba-tc86c001-ide-driver-take-2-fix-2.patch make-drivers-char-mxser_newcmxser_hangup-static.patch drivers-char-vc_screenc-proper-prototypes.patch add-taint_user-and-ability-to-set-taint-flags-from-userspace-fix.patch schedule-obsolete-oss-drivers-for-removal-3rd-round.patch more-ftape-removal.patch cleanup-linux-byteorder-swabbh.patch gtod-persistent-clock-support-core.patch gtod-persistent-clock-support-i386.patch dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch clockevents-i386-drivers.patch make-ext2_get_blocks-static.patch drivers-edac-make-code-static.patch drivers-isdn-pcbit-proper-prototypes.patch drivers-isdn-hisax-proper-prototypes.patch include-linux-nfsd-consth-remove-nfs_super_magic.patch readahead-events-accounting-make-readahead_debug_level-static.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch fs-reiser4-more-possible-cleanups.patch fbdev-driver-for-s3-trio-virge-cleanups.patch remove-broken-video-drivers-v4.patch remove-bogus-con_is_present-prototypes.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slim-debug-output-slm_set_taskperm-remove-horrible-error-handling-code.patch debug-shared-irqs-kconfig-fix.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