From 47e8cf3c2b80181267723850dbca7c9af5473814 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 11 Dec 2006 12:02:43 -0800 Subject: [PATCH] Sync with mainline: More tabify, use CONFIG_PM_DEBUG for gpio debug More tabify, use CONFIG_PM_DEBUG for gpio debug Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/bootreason.c | 6 +++--- arch/arm/plat-omap/clock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/plat-omap/bootreason.c b/arch/arm/plat-omap/bootreason.c index cb3e67ae682..253dfcf1ecc 100644 --- a/arch/arm/plat-omap/bootreason.c +++ b/arch/arm/plat-omap/bootreason.c @@ -34,7 +34,7 @@ static char boot_reason[16]; static int omap_bootreason_read_proc(char *page, char **start, off_t off, - int count, int *eof, void *data) + int count, int *eof, void *data) { int len = 0; @@ -54,7 +54,7 @@ static int __init bootreason_init(void) { const struct omap_boot_reason_config *cfg; int reason_valid = 0; - + cfg = omap_get_config(OMAP_TAG_BOOT_REASON, struct omap_boot_reason_config); if (cfg != NULL) { strncpy(boot_reason, cfg->reason_str, sizeof(cfg->reason_str)); @@ -70,7 +70,7 @@ static int __init bootreason_init(void) printk(KERN_INFO "Bootup reason: %s\n", boot_reason); if (!create_proc_read_entry("bootreason", S_IRUGO, NULL, - omap_bootreason_read_proc, NULL)) + omap_bootreason_read_proc, NULL)) return -ENOMEM; return 0; diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 9bfcf7ec475..a463fa2f7d3 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -395,7 +395,7 @@ int __init clk_init(struct clk_functions * custom_clocks) return 0; } -#ifdef CONFIG_PROC_FS +#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_PROC_FS) #include #include @@ -454,5 +454,5 @@ int __init omap_ck_init(void) } __initcall(omap_ck_init); -#endif /* CONFIG_DEBUG_PROC_FS */ +#endif -- 2.41.1