From da66e13f0c03a8a3080050d61bda9cad42486220 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 11 Jul 2012 14:53:45 +0800 Subject: [PATCH] rk: add RK_CLOCK_PROC config, disable /proc/clocks by default --- arch/arm/mach-rk30/clock.c | 6 +++--- arch/arm/plat-rk/Kconfig | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rk30/clock.c b/arch/arm/mach-rk30/clock.c index 264642ed1d3e..a763cc74e953 100755 --- a/arch/arm/mach-rk30/clock.c +++ b/arch/arm/mach-rk30/clock.c @@ -696,14 +696,14 @@ cnu_out: } EXPORT_SYMBOL(rk30_clk_notifier_unregister); -#ifdef CONFIG_PROC_FS static struct clk_dump_ops *dump_def_ops; void clk_register_dump_ops(struct clk_dump_ops *ops) { dump_def_ops=ops; } - + +#ifdef CONFIG_RK_CLOCK_PROC static int proc_clk_show(struct seq_file *s, void *v) { struct clk* clk; @@ -747,5 +747,5 @@ static int __init clk_proc_init(void) } late_initcall(clk_proc_init); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_RK_CLOCK_PROC */ diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig index b2413468965f..9be603ebce15 100644 --- a/arch/arm/plat-rk/Kconfig +++ b/arch/arm/plat-rk/Kconfig @@ -101,6 +101,10 @@ config DVFS depends on REGULATOR&&CPU_FREQ default y +config RK_CLOCK_PROC + bool "/proc/clocks support" + depends on PROC_FS + config WIFI_CONTROL_FUNC bool "Enable WiFi control function abstraction" help -- 2.34.1