aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/gptimers.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-03-28 20:32:57 +0800
committerBryan Wu <cooloney@kernel.org>2009-03-28 20:32:57 +0800
commit269647dc8f3b557d0f9ec59533a5e651cc109efb (patch)
tree67fe4ed8ecea6752624d0a915f9f68e26df6774d /arch/blackfin/include/asm/gptimers.h
parentffc89627ae14b46f41836ddabdc9dc77c597eca5 (diff)
downloadkernel_samsung_aries-269647dc8f3b557d0f9ec59533a5e651cc109efb.zip
kernel_samsung_aries-269647dc8f3b557d0f9ec59533a5e651cc109efb.tar.gz
kernel_samsung_aries-269647dc8f3b557d0f9ec59533a5e651cc109efb.tar.bz2
Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x
convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x as the defines are redundant in these cases Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/include/asm/gptimers.h')
-rw-r--r--arch/blackfin/include/asm/gptimers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h
index a29f649..b0f847a 100644
--- a/arch/blackfin/include/asm/gptimers.h
+++ b/arch/blackfin/include/asm/gptimers.h
@@ -17,14 +17,14 @@
/*
* BF51x/BF52x/BF537: 8 timers:
*/
-#if defined(CONFIG_BF51x) || defined(BF527_FAMILY) || defined(BF537_FAMILY)
+#if defined(CONFIG_BF51x) || defined(CONFIG_BF52x) || defined(BF537_FAMILY)
# define MAX_BLACKFIN_GPTIMERS 8
# define TIMER0_GROUP_REG TIMER_ENABLE
#endif
/*
* BF54x: 11 timers (BF542: 8 timers):
*/
-#if defined(BF548_FAMILY)
+#if defined(CONFIG_BF54x)
# ifdef CONFIG_BF542
# define MAX_BLACKFIN_GPTIMERS 8
# else