From 0dba1fa88e2f468fd80a3d61fc796238e2afd223 Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Tue, 23 Aug 2011 16:08:06 +0900 Subject: [PATCH] --- yaml --- r: 272563 b: refs/heads/master c: 481411568062e1ab4424e6021e9ec500eaefc4ac h: refs/heads/master i: 272561: 8cce18edf4e415a2bf208b3421fdac2167ee9cc3 272559: 1279e578d823221f114a22d982075b949cb868be v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s5p/include/plat/pll.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57975a0de8dc..d1e44e20ee57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0804765afcafe9c88890af7ab71710603ccd9442 +refs/heads/master: 481411568062e1ab4424e6021e9ec500eaefc4ac diff --git a/trunk/arch/arm/plat-s5p/include/plat/pll.h b/trunk/arch/arm/plat-s5p/include/plat/pll.h index bf28fadee7ae..ebc142c5c84c 100644 --- a/trunk/arch/arm/plat-s5p/include/plat/pll.h +++ b/trunk/arch/arm/plat-s5p/include/plat/pll.h @@ -72,7 +72,6 @@ static inline unsigned long s5p_get_pll46xx(unsigned long baseclk, mdiv = (pll_con0 >> PLL46XX_MDIV_SHIFT) & PLL46XX_MDIV_MASK; pdiv = (pll_con0 >> PLL46XX_PDIV_SHIFT) & PLL46XX_PDIV_MASK; sdiv = (pll_con0 >> PLL46XX_SDIV_SHIFT) & PLL46XX_SDIV_MASK; - kdiv = pll_con1 & PLL46XX_KDIV_MASK; if (pll_type == pll_4650c) kdiv = pll_con1 & PLL4650C_KDIV_MASK;