From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - drivers-mtd-maps-nettelc-possible-cleanups.patch removed from -mm tree Date: Fri, 29 Jun 2007 13:41:25 -0700 Message-ID: <200706292041.l5TKfPIZ022575@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:44988 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754286AbXF2Uuq (ORCPT ); Fri, 29 Jun 2007 16:50:46 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: bunk@stusta.de, gerg@snapgear.com, mm-commits@vger.kernel.org The patch titled drivers/mtd/maps/nettel.c: possible cleanups has been removed from the -mm tree. Its filename was drivers-mtd-maps-nettelc-possible-cleanups.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/mtd/maps/nettel.c: possible cleanups From: Adrian Bunk - make 2 needlessly global functions static - #if 0 the unused nettel_eraseconfig() Signed-off-by: Adrian Bunk Cc: Greg Ungerer Signed-off-by: Andrew Morton --- drivers/mtd/maps/nettel.c | 10 ++++++++-- 1 files 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@stusta.de are git-acpi.patch make-drivers-acpi-oslcosi_linux-static.patch drivers-acpi-processor_throttlingc-make-2-functions.patch drivers-cpuidle-governors-menuc-make-a-struct-static.patch drivers-acpi-sbsc-remove-dead-code.patch make-drivers-char-hvc_consoleckhvcd-static.patch git-dvb.patch git-input.patch git-kvm.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch git-md-accel.patch git-mmc.patch git-mtd.patch nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch git-battery.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-wd33c93c-cleanups.patch make-seagate_st0x_detect-static.patch drivers-scsi-pcmcia-nsp_csc-remove-kernel-24-code.patch remove-the-dead-cyberstormiii_scsi-option.patch scsi-lpfc-lpfc_initc-remove-unused-variable.patch git-unionfs.patch git-ipwireless_cs.patch fix-x86_64-mm-xen-add-xen-virtual-block-device-driver.patch make-arch-i386-kernel-setupcremapped_pgdat_init-static.patch arch-i386-kernel-i8253c-should-include-asm-timerh.patch make-arch-i386-kernel-io_apicctimer_irq_works-static-again.patch i386-remove-support-for-the-rise-cpu.patch i386-make-arch-i386-mm-pgtablecpgd_cdtor-static.patch mm-slabc-start_cpu_timer-should-be-__cpuinit.patch handle-kernelcore=-generic-fix.patch maps2-add-proc-kpagemap-interface.patch lumpy-reclaim-v4.patch swsusp-remove-code-duplication-between-diskc-and-userc-fix.patch more-scheduled-oss-driver-removal.patch init-wait-for-asynchronously-scanned-block-devices-fix.patch kernel-utf-8-handling-fix.patch remove-sonypi_camera_command.patch fs-namespacec-should-include-internalh.patch proper-prototype-for-proc_nr_files.patch fs-reiserfs-cleanups.patch introduce-i_sync-fix.patch ext2-reservations.patch revoke-core-code.patch oss-trident-fix-locking-around-write_voice_regs.patch remove-options-depending-on-oss_obsolete.patch pm3fb-possible-cleanups.patch vt8623fbc-make-code-static.patch kernel-sched_fairc-make-code-static.patch fs-proc-basec-make-a-struct-static.patch mm-implement-swap-prefetching-make-mm-swap_prefetchcremove_from_swapped_list.patch drivers-edac-core-make-functions-static.patch lockstat-human-readability-tweaks-fix.patch reiser4-export-remove_from_page_cache.patch reiser4.patch mutex-subsystem-synchro-test-module.patch