forked from luck/tmp_suning_uos_patched
[PATCH] Kill ifdefs in mtdcore.c
Kill unneccessary ifdefs in mtdcore.c. Signed-off-by: Pavel Machek <pavel@suse.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
8b68a12633
commit
2d2dce0eb6
|
@ -19,9 +19,7 @@
|
|||
#include <linux/ioctl.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/mtd/compatmac.h>
|
||||
#ifdef CONFIG_PROC_FS
|
||||
#include <linux/proc_fs.h>
|
||||
#endif
|
||||
|
||||
#include <linux/mtd/mtd.h>
|
||||
|
||||
|
@ -296,10 +294,11 @@ EXPORT_SYMBOL(unregister_mtd_user);
|
|||
EXPORT_SYMBOL(default_mtd_writev);
|
||||
EXPORT_SYMBOL(default_mtd_readv);
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
||||
/*====================================================================*/
|
||||
/* Support for /proc/mtd */
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static struct proc_dir_entry *proc_mtd;
|
||||
|
||||
static inline int mtd_proc_info (char *buf, int i)
|
||||
|
@ -344,31 +343,27 @@ static int mtd_read_proc (char *page, char **start, off_t off, int count,
|
|||
return ((count < begin+len-off) ? count : begin+len-off);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/*====================================================================*/
|
||||
/* Init code */
|
||||
|
||||
static int __init init_mtd(void)
|
||||
{
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if ((proc_mtd = create_proc_entry( "mtd", 0, NULL )))
|
||||
proc_mtd->read_proc = mtd_read_proc;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit cleanup_mtd(void)
|
||||
{
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (proc_mtd)
|
||||
remove_proc_entry( "mtd", NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
module_init(init_mtd);
|
||||
module_exit(cleanup_mtd);
|
||||
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
|
||||
|
|
Loading…
Reference in New Issue
Block a user