From 4a094f8fe4cb3744172acb132377b2ac387c279b Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 24 Dec 2010 12:15:57 +0900 Subject: [PATCH] --- yaml --- r: 223671 b: refs/heads/master c: 27f1acccd4d310e941d2e879445324595e2fe463 h: refs/heads/master i: 223669: 35eafaa04f84e41fa66b27eb1fa054484d06ff93 223667: 64a2f27986d8e1a931e79da847ca3c4a003cd3a4 223663: ca31b9b67b3f7fa19a11d2d74291483443f185e6 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a60f1ddcf72..51abc028c648 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27434f0af0fecba71fa58407715028d2b9550956 +refs/heads/master: 27f1acccd4d310e941d2e879445324595e2fe463 diff --git a/trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c b/trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c index b26264dc2aef..c509c40cba4b 100644 --- a/trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c +++ b/trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c @@ -34,7 +34,7 @@ static const int pfc_divisors[]={1,2,3,4,6,8,12}; static void master_clk_init(struct clk *clk) { - return 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007]; + clk->rate = 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007]; } static struct clk_ops sh7201_master_clk_ops = {