From 7070f894d1c47c754ed533126342331312f3189b Mon Sep 17 00:00:00 2001
From: Javi Merino <javi.merino@arm.com>
Date: Wed, 16 Nov 2011 12:45:39 +0100
Subject: [PATCH] --- yaml --- r: 276143 b: refs/heads/master c:
 1c8a7c1fbfc7ae2362d26559df26b99c806b68b5 h: refs/heads/master i:   276141:
 e0cac299f154e4351c446a85acfd2d7971849b92   276139:
 9b0805acf8a4437cdd7a1f0fbc82506f7d47b087   276135:
 c71c85a9e22655577e4a7a0e40da4181cb6ebf39   276127:
 423b277b60b8f9bab5956f827f835dd0988761a2 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/common/pl330.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 67185832e624..6c93ab9e3343 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2674dd0b1c07d8b8dfb4872fc7b41841f05cb957
+refs/heads/master: 1c8a7c1fbfc7ae2362d26559df26b99c806b68b5
diff --git a/trunk/arch/arm/common/pl330.c b/trunk/arch/arm/common/pl330.c
index f748a385693f..f407a6b35d3d 100644
--- a/trunk/arch/arm/common/pl330.c
+++ b/trunk/arch/arm/common/pl330.c
@@ -1211,8 +1211,8 @@ static inline u32 _prepare_ccr(const struct pl330_reqcfg *rqc)
 	ccr |= (rqc->brst_size << CC_SRCBRSTSIZE_SHFT);
 	ccr |= (rqc->brst_size << CC_DSTBRSTSIZE_SHFT);
 
-	ccr |= (rqc->dcctl << CC_SRCCCTRL_SHFT);
-	ccr |= (rqc->scctl << CC_DSTCCTRL_SHFT);
+	ccr |= (rqc->scctl << CC_SRCCCTRL_SHFT);
+	ccr |= (rqc->dcctl << CC_DSTCCTRL_SHFT);
 
 	ccr |= (rqc->swap << CC_SWAP_SHFT);