projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '080208_dupint' of git://linux-arm.org/u-boot-armdev
[oweals/u-boot.git]
/
cpu
/
arm926ejs
/
interrupts.c
diff --git
a/cpu/arm926ejs/interrupts.c
b/cpu/arm926ejs/interrupts.c
index 1819f6b0787963ab3309be2c9992d8b0bbdaf03c..0971fea8143b39dea218648dd31b5ec0c4fd5ea0 100644
(file)
--- a/
cpu/arm926ejs/interrupts.c
+++ b/
cpu/arm926ejs/interrupts.c
@@
-38,7
+38,7
@@
#include <common.h>
#include <arm926ejs.h>
-#if
def CONFIG_INTEGRATOR
+#if
defined(CONFIG_INTEGRATOR) || defined(CONFIG_AT91CAP9ADK)
/* Timer functionality supplied by Integrator board (AP or CP) */