The patch titled drivers/mtd/maps/nettel.c: possible cleanups has been added to the -mm tree. Its filename is drivers-mtd-maps-nettelc-possible-cleanups.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: drivers/mtd/maps/nettel.c: possible cleanups From: Adrian Bunk <bunk@xxxxxxxxx> - make 2 needlessly global functions static - #if 0 the unused nettel_eraseconfig() Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/maps/nettel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff -puN drivers/mtd/maps/nettel.c~drivers-mtd-maps-nettelc-possible-cleanups drivers/mtd/maps/nettel.c --- a/drivers/mtd/maps/nettel.c~drivers-mtd-maps-nettelc-possible-cleanups +++ a/drivers/mtd/maps/nettel.c @@ -158,6 +158,8 @@ static struct notifier_block nettel_noti nettel_reboot_notifier, NULL, 0 }; +#if 0 + /* * Erase the configuration file system. * Used to support the software reset button. @@ -208,18 +210,22 @@ int nettel_eraseconfig(void) return(0); } +#endif /* 0 */ + #else +#if 0 int nettel_eraseconfig(void) { return(0); } +#endif /* 0 */ #endif /****************************************************************************/ -int __init nettel_init(void) +static int __init nettel_init(void) { volatile unsigned long *amdpar; unsigned long amdaddr, maxsize; @@ -477,7 +483,7 @@ out_unmap2: /****************************************************************************/ -void __exit nettel_cleanup(void) +static void __exit nettel_cleanup(void) { #ifdef CONFIG_MTD_CFI_INTELEXT unregister_reboot_notifier(&nettel_notifier_block); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch proper-prototype-for-hugetlb_get_unmapped_area.patch mm-slabc-proper-prototypes.patch git-acpi.patch git-alsa.patch git-powerpc.patch git-drm.patch git-dvb.patch git-gfs2-nmw.patch git-ieee1394.patch kconfig-abort-configuration-with-recursive-dependencies.patch git-kvm.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch git-mmc.patch git-mtd.patch nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch drivers-mtd-maps-nettelc-possible-cleanups.patch ibmtr_cs-fix-hang-on-eject.patch git-ocfs2.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-wd33c93c-cleanups.patch drivers-scsi-qla4xxx-possible-cleanups.patch make-seagate_st0x_detect-static.patch remove-the-broken-scsi_acornscsi_3-driver.patch scsi-lpfc-lpfc_initc-remove-unused-variable.patch drivers-scsi-pcmcia-nsp_csc-remove-kernel-24-code.patch drivers-scsi-ipsc-remove-kernel-24-code.patch drivers-scsi-nsp32c-remove-kernel-24-code.patch git-unionfs.patch git-watchdog.patch git-wireless.patch git-ipwireless_cs.patch make-arch-i386-kernel-setupcremapped_pgdat_init-static.patch arch-i386-kernel-i8253c-should-include-asm-timerh.patch maps2-add-proc-kpagemap-interface.patch lumpy-reclaim-v4.patch filesystem-disk-errors-at-boot-time-caused-by-probe.patch drivers-char-hvc_consolec-cleanups.patch init-do_mountsc-proper-prepare_namespace-prototype.patch apple-smc-driver-hardware-monitoring-and-control-cleanup.patch the-scheduled-removal-of-obsolete_oss-options.patch add-file-position-info-to-proc.patch more-scheduled-oss-driver-removal.patch schedule-obsolete-oss-drivers-for-removal-4th-round.patch make-remove_inode_dquot_ref-static.patch unexport-pci_proc_attach_device.patch fix-race-between-rmmod-and-cat-proc-kallsyms.patch the-scheduled-einval-for-invalid-timevals-in-setitimer.patch ext2-reservations.patch make-drivers-isdn-capi-capiutilccdebbuf_alloc-static.patch remove-nfs4_acl_add_ace.patch rtc-remove-sys-class-rtc-dev-fix.patch linux-kernel-markers-kconfig-menus.patch linux-kernel-markers-architecture-independant-code.patch linux-kernel-markers-i386-optimization.patch no-longer-include-asm-kdebugh.patch revoke-core-code-fs-revokec-cleanups-and-bugfix-for-64bit-systems.patch readahead-events-accounting.patch reiser4-export-remove_from_page_cache.patch reiser4.patch fbdev-display-class-fix.patch fbdev-mm-deferred-io-support-fix.patch fbdev-hecuba-framebuffer-driver-fix.patch drivers-video-sis-remove-more-kernel-24-code.patch slim-main-patch.patch slim-debug-output.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