diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-31 07:08:33 +0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-31 07:08:33 +0400 |
commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /arch/blackfin/include/asm/gptimers.h | |
parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
download | linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/blackfin/include/asm/gptimers.h')
-rw-r--r-- | arch/blackfin/include/asm/gptimers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h index 0520d2aac8f3..b0f847ae4bf4 100644 --- a/arch/blackfin/include/asm/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h @@ -15,16 +15,16 @@ #include <asm/blackfin.h> /* - * BF537/BF527: 8 timers: + * BF51x/BF52x/BF537: 8 timers: */ -#if 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 |