diff --git a/[refs] b/[refs] index 56395bf491b8..b3344cdbf298 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1312bfcc25f9301f997bf1ce84355a0f1167847 +refs/heads/master: ffc89627ae14b46f41836ddabdc9dc77c597eca5 diff --git a/trunk/arch/blackfin/include/asm/gptimers.h b/trunk/arch/blackfin/include/asm/gptimers.h index 0520d2aac8f3..a29f649e1729 100644 --- a/trunk/arch/blackfin/include/asm/gptimers.h +++ b/trunk/arch/blackfin/include/asm/gptimers.h @@ -15,9 +15,9 @@ #include /* - * BF537/BF527: 8 timers: + * BF51x/BF52x/BF537: 8 timers: */ -#if defined(BF527_FAMILY) || defined(BF537_FAMILY) +#if defined(CONFIG_BF51x) || defined(BF527_FAMILY) || defined(BF537_FAMILY) # define MAX_BLACKFIN_GPTIMERS 8 # define TIMER0_GROUP_REG TIMER_ENABLE #endif