diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/blackfin/mach-common/ints-priority.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/blackfin/mach-common/ints-priority.c')
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 62f8883a5c27..5fa536727c61 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
| @@ -216,7 +216,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) | |||
| 216 | wakeup |= KPADWE; | 216 | wakeup |= KPADWE; |
| 217 | break; | 217 | break; |
| 218 | #endif | 218 | #endif |
| 219 | #ifdef IRQ_CNT | 219 | #ifdef CONFIG_BF54x |
| 220 | case IRQ_CNT: | 220 | case IRQ_CNT: |
| 221 | wakeup |= ROTWE; | 221 | wakeup |= ROTWE; |
| 222 | break; | 222 | break; |
| @@ -983,7 +983,7 @@ int __init init_arch_irq(void) | |||
| 983 | 983 | ||
| 984 | local_irq_disable(); | 984 | local_irq_disable(); |
| 985 | 985 | ||
| 986 | #if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF537) | 986 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) |
| 987 | /* Clear EMAC Interrupt Status bits so we can demux it later */ | 987 | /* Clear EMAC Interrupt Status bits so we can demux it later */ |
| 988 | bfin_write_EMAC_SYSTAT(-1); | 988 | bfin_write_EMAC_SYSTAT(-1); |
| 989 | #endif | 989 | #endif |