diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:59:12 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:59:12 -0500 |
commit | 8797b9d0f050f5d5c5b6ccb9b3c993bc02d6937b (patch) | |
tree | c6305b31b18ca2f49c1e1b88fec9c920be0252f2 /drivers/clk/pxa/clk-pxa3xx.c | |
parent | 48ffd0d5e7b2fb6e7d47344320dbeeaf15d6fd5a (diff) | |
parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) |
Merge tag 'lsk-v4.1-15.09-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1-rtlinux-lng-preempt-rt-4.1.7-2015.12linux-lng-preempt-rt-4.1.7-2015.11linux-lng-preempt-rt-4.1.7-2015.10
LSK RT 15.09 v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/distribution.conf
Diffstat (limited to 'drivers/clk/pxa/clk-pxa3xx.c')
-rw-r--r-- | drivers/clk/pxa/clk-pxa3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c index 4b93a1efb36d..ac03ba49e9d1 100644 --- a/drivers/clk/pxa/clk-pxa3xx.c +++ b/drivers/clk/pxa/clk-pxa3xx.c @@ -126,7 +126,7 @@ PARENTS(pxa3xx_ac97_bus) = { "ring_osc_60mhz", "ac97" }; PARENTS(pxa3xx_sbus) = { "ring_osc_60mhz", "system_bus" }; PARENTS(pxa3xx_smemcbus) = { "ring_osc_60mhz", "smemc" }; -#define CKEN_AB(bit) ((CKEN_ ## bit > 31) ? &CKENA : &CKENB) +#define CKEN_AB(bit) ((CKEN_ ## bit > 31) ? &CKENB : &CKENA) #define PXA3XX_CKEN(dev_id, con_id, parents, mult_lp, div_lp, mult_hp, \ div_hp, bit, is_lp, flags) \ PXA_CKEN(dev_id, con_id, bit, parents, mult_lp, div_lp, \ |