Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5fe8afd2 authored by basamaryan's avatar basamaryan Committed by Michael Bestas
Browse files

clk: Fix mismerge 

The all_lists structure was placed in the wrong location, causing
the build to fail when CONFIG_DEBUG_FS is not defined.

Fix this up by moving the struct to the correct place in the file.

Change-Id: I18c5ed3491845583d80dcf1a7bfde41eaf904f98
parent 95b3ecc8

drivers/clk/clk.c

+6 −6
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ static HLIST_HEAD(clk_root_list); 
static HLIST_HEAD(clk_orphan_list);

static LIST_HEAD(clk_notifier_list);



static struct hlist_head *all_lists[] = {

	&clk_root_list,

	&clk_orphan_list,

	NULL,

};



struct clk_handoff_vdd {

	struct list_head list;

	struct clk_vdd_class *vdd_class;
@@ -2693,12 +2699,6 @@ static u32 debug_suspend; 
static DEFINE_MUTEX(clk_debug_lock);

static HLIST_HEAD(clk_debug_list);



static struct hlist_head *all_lists[] = {

	&clk_root_list,

	&clk_orphan_list,

	NULL,

};



static struct hlist_head *orphan_list[] = {

	&clk_orphan_list,

	NULL,