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 <tony@atomide.com>

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;

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 <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
@@ -454,5 +454,5 @@ int __init omap_ck_init(void)
 
 }
 __initcall(omap_ck_init);
-#endif /* CONFIG_DEBUG_PROC_FS */
+#endif