summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537/boards/cm_bf537.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-11-02 14:03:14 +1100
committerPaul Mackerras <paulus@samba.org>2007-11-02 14:03:14 +1100
commit97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch)
tree8f7f591754baa934a842357e75e773a525bfb147 /arch/blackfin/mach-bf537/boards/cm_bf537.c
parentf6ab0b922c3423b88c0e6e3e2c5fc1e58d83055d (diff)
parent54866f032307063776b4eff7eadb131d47f9f9b4 (diff)
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/cm_bf537.c')
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 52e2320307d..2915931045e 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -281,8 +281,8 @@ static struct resource net2272_bfin_resources[] = {
.end = 0x20200000 + 0x100,
.flags = IORESOURCE_MEM,
}, {
- .start = IRQ_PF7,
- .end = IRQ_PF7,
+ .start = IRQ_PH14,
+ .end = IRQ_PH14,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
},
};