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

Commit 6cc96ddb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical 

From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: add dummy SA1100 rtc clock in pxa25x
parents 2054271b d90cb69d

arch/arm/mach-pxa/pxa25x.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -209,6 +209,7 @@ static struct clk_lookup pxa25x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),

	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),

	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),

	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),

	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),

};

};





static struct clk_lookup pxa25x_hwuart_clkreg =

static struct clk_lookup pxa25x_hwuart_clkreg =