diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/asm-arm/irq.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/asm-arm/irq.h')
| -rw-r--r-- | include/asm-arm/irq.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h index 60b5105c9c93..66e67e60bc56 100644 --- a/include/asm-arm/irq.h +++ b/include/asm-arm/irq.h | |||
| @@ -47,10 +47,6 @@ void disable_irq_wake(unsigned int irq); | |||
| 47 | void enable_irq_wake(unsigned int irq); | 47 | void enable_irq_wake(unsigned int irq); |
| 48 | int setup_irq(unsigned int, struct irqaction *); | 48 | int setup_irq(unsigned int, struct irqaction *); |
| 49 | 49 | ||
| 50 | struct irqaction; | ||
| 51 | struct pt_regs; | ||
| 52 | int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *); | ||
| 53 | |||
| 54 | extern void migrate_irqs(void); | 50 | extern void migrate_irqs(void); |
| 55 | #endif | 51 | #endif |
| 56 | 52 | ||