diff options
| author | danh-arm <dan.handley@arm.com> | 2017-01-23 16:49:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:49:43 +0000 |
| commit | 4abd2225c232e5d102e52db504c7f0f363b87795 (patch) | |
| tree | 37b3325a0e118c50742f61ba4733a7ff4b9b82bb /drivers | |
| parent | e02be2072276769f69735027bcab6868a5ac12e1 (diff) | |
| parent | 6af03f9c455861d1d37439665bc06c415215d36a (diff) | |
Merge pull request #800 from masahir0y/ifdef
Correct preprocessor conditionals
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/ccn/ccn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index 060acdd2..d739c6bf 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.c @@ -38,7 +38,7 @@ #include "ccn_private.h" static const ccn_desc_t *ccn_plat_desc; -#if IMAGE_BL31 +#ifdef IMAGE_BL31 DEFINE_BAKERY_LOCK(ccn_lock); #endif @@ -285,7 +285,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, assert(ccn_plat_desc); assert(ccn_plat_desc->periphbase); -#if IMAGE_BL31 +#ifdef IMAGE_BL31 bakery_lock_get(&ccn_lock); #endif start_region_id = region_id; @@ -305,7 +305,7 @@ static void ccn_snoop_dvm_do_op(unsigned long long rn_id_map, rn_id_map); } -#if IMAGE_BL31 +#ifdef IMAGE_BL31 bakery_lock_release(&ccn_lock); #endif } |