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-sh/irq-sh73180.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-sh/irq-sh73180.h')
| -rw-r--r-- | include/asm-sh/irq-sh73180.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sh/irq-sh73180.h b/include/asm-sh/irq-sh73180.h index d705252be260..b28af9a69d72 100644 --- a/include/asm-sh/irq-sh73180.h +++ b/include/asm-sh/irq-sh73180.h | |||
| @@ -311,6 +311,4 @@ | |||
| 311 | #define IRQ6_PRIORITY 1 | 311 | #define IRQ6_PRIORITY 1 |
| 312 | #define IRQ7_PRIORITY 1 | 312 | #define IRQ7_PRIORITY 1 |
| 313 | 313 | ||
| 314 | int shmse_irq_demux(int irq); | ||
| 315 | |||
| 316 | #endif /* __ASM_SH_IRQ_SH73180_H */ | 314 | #endif /* __ASM_SH_IRQ_SH73180_H */ |