diff options
| author | Kevin Cernekee <kpc.mtd@gmail.com> | 2009-04-04 11:03:04 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-04 22:52:08 +0100 |
| commit | 45b09076149f1360e15919ca7e004e8d3810a0f7 (patch) | |
| tree | b6e60e99ef7a7d516bd36fa8cd6f1bb6d21e1e7f /drivers/mtd | |
| parent | c451c7c4c9c4f59c7808a7d397d32bef160c14d9 (diff) | |
| download | linux-3.10-45b09076149f1360e15919ca7e004e8d3810a0f7.tar.gz linux-3.10-45b09076149f1360e15919ca7e004e8d3810a0f7.tar.bz2 linux-3.10-45b09076149f1360e15919ca7e004e8d3810a0f7.zip | |
[MTD] sysfs support should not depend on CONFIG_PROC_FS
Move the driver model init code out of the "#ifdef CONFIG_PROC_FS"
block.
Tested with both values of CONFIG_PROC_FS . Tested with CONFIG_MTD=m .
Issue was reported here: http://lkml.org/lkml/2009/4/4/107
Signed-off-by: Kevin Cernekee <kpc.mtd@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/mtdcore.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 89c1e5ddc7c..fdd6ae85939 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -585,6 +585,8 @@ done: return ((count < begin+len-off) ? count : begin+len-off); } +#endif /* CONFIG_PROC_FS */ + /*====================================================================*/ /* Init code */ @@ -596,24 +598,25 @@ static int __init init_mtd(void) pr_err("Error creating mtd class.\n"); return PTR_ERR(mtd_class); } +#ifdef CONFIG_PROC_FS if ((proc_mtd = create_proc_entry( "mtd", 0, NULL ))) proc_mtd->read_proc = mtd_read_proc; +#endif /* CONFIG_PROC_FS */ return 0; } static void __exit cleanup_mtd(void) { +#ifdef CONFIG_PROC_FS if (proc_mtd) remove_proc_entry( "mtd", NULL); +#endif /* CONFIG_PROC_FS */ class_destroy(mtd_class); } module_init(init_mtd); module_exit(cleanup_mtd); -#endif /* CONFIG_PROC_FS */ - - MODULE_LICENSE("GPL"); MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>"); MODULE_DESCRIPTION("Core MTD registration and access routines"); |