Commit 6f3a283c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-em' 

* pm-em:
  PM: EM: postpone creating the debugfs dir till fs_initcall
parents 5244f5e2 fb9d62b2

kernel/power/energy_model.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int __init em_debug_init(void) 


	return 0;

}

core_initcall(em_debug_init);

fs_initcall(em_debug_init);

#else /* CONFIG_DEBUG_FS */

static void em_debug_create_pd(struct device *dev) {}

static void em_debug_remove_pd(struct device *dev) {}