summaryrefslogtreecommitdiff
path: root/include/asm-blackfin/irq.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-03-22 00:00:03 +0100
committerWolfgang Denk <wd@denx.de>2007-03-22 00:00:03 +0100
commita17824c749aac3df0bbb528bb5d33af68296b0b1 (patch)
tree399efb15b55d6992279eef98fa6878852d403352 /include/asm-blackfin/irq.h
parent2a8dfe08359a1b663418b2faa1da1d7bce34d302 (diff)
parentb2777c087b5a564e9209988873da4ec749f85aad (diff)
downloadu-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.zip
u-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.gz
u-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin
Diffstat (limited to 'include/asm-blackfin/irq.h')
-rw-r--r--include/asm-blackfin/irq.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-blackfin/irq.h b/include/asm-blackfin/irq.h
index 5fbc5a3..aede742 100644
--- a/include/asm-blackfin/irq.h
+++ b/include/asm-blackfin/irq.h
@@ -39,7 +39,7 @@
#define _BLACKFIN_IRQ_H_
#include <linux/config.h>
-#include <asm/cpu/bf533_irq.h>
+#include <asm/hw_irq.h>
/*
* On the Blackfin, the interrupt structure allows remmapping of the hardware
@@ -85,8 +85,8 @@ static __inline__ int irq_cannonicalize(int irq)
extern void (*mach_enable_irq) (unsigned int);
extern void (*mach_disable_irq) (unsigned int);
extern int sys_request_irq(unsigned int,
- void (*)(int, void *, struct pt_regs *),
- unsigned long, const char *, void *);
+ void (*)(int, void *, struct pt_regs *),
+ unsigned long, const char *, void *);
extern void sys_free_irq(unsigned int, void *);
/*