diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /include/asm-m68knommu/machdep.h | |
parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-m68knommu/machdep.h')
-rw-r--r-- | include/asm-m68knommu/machdep.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-m68knommu/machdep.h b/include/asm-m68knommu/machdep.h index 1cf26d240d83..de9f47a51cc2 100644 --- a/include/asm-m68knommu/machdep.h +++ b/include/asm-m68knommu/machdep.h | |||
@@ -21,4 +21,6 @@ extern void (*mach_power_off)( void ); | |||
21 | 21 | ||
22 | extern void config_BSP(char *command, int len); | 22 | extern void config_BSP(char *command, int len); |
23 | 23 | ||
24 | extern void do_IRQ(int irq, struct pt_regs *fp); | ||
25 | |||
24 | #endif /* _M68KNOMMU_MACHDEP_H */ | 26 | #endif /* _M68KNOMMU_MACHDEP_H */ |