diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /include/asm-frv/mb93493-irqs.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-frv/mb93493-irqs.h')
| -rw-r--r-- | include/asm-frv/mb93493-irqs.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-frv/mb93493-irqs.h b/include/asm-frv/mb93493-irqs.h index 15096e731325..82c7aeddd333 100644 --- a/include/asm-frv/mb93493-irqs.h +++ b/include/asm-frv/mb93493-irqs.h | |||
| @@ -12,11 +12,9 @@ | |||
| 12 | #ifndef _ASM_MB93493_IRQS_H | 12 | #ifndef _ASM_MB93493_IRQS_H |
| 13 | #define _ASM_MB93493_IRQS_H | 13 | #define _ASM_MB93493_IRQS_H |
| 14 | 14 | ||
| 15 | #ifndef __ASSEMBLY__ | 15 | #include <asm/irq.h> |
| 16 | |||
| 17 | #include <asm/irq-routing.h> | ||
| 18 | 16 | ||
| 19 | #define IRQ_BASE_MB93493 (NR_IRQ_ACTIONS_PER_GROUP * 2) | 17 | #ifndef __ASSEMBLY__ |
| 20 | 18 | ||
| 21 | /* IRQ IDs presented to drivers */ | 19 | /* IRQ IDs presented to drivers */ |
| 22 | enum { | 20 | enum { |