From: Paul Mundt Date: Mon, 8 Aug 2011 07:41:23 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4791d63bd40ec63c533060707dae0232b9969dc0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into rmobile-latest --- 4791d63bd40ec63c533060707dae0232b9969dc0 diff --cc arch/arm/mach-shmobile/clock-sh7372.c index 59a8f4cde108,6b1619a65dba..dc8c899aa5eb --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c @@@ -558,13 -559,8 +558,9 @@@ static struct clk mstp_clks[MSTP_NR] = [MSTP410] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 10, 0), /* IIC4 */ [MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */ [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ + [MSTP400] = MSTP(&r_clk, SMSTPCR4, 0, 0), /* CMT2 */ }; - #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } - #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } - #define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk } - static struct clk_lookup lookups[] = { /* main clocks */ CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk),