Commit 041a6bae authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] fallout from alpha pt_regs patches

missed irq handler in sys_titan and forgotten prototype update.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 63540ba3
...@@ -36,7 +36,7 @@ extern void cia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t); ...@@ -36,7 +36,7 @@ extern void cia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
extern struct pci_ops irongate_pci_ops; extern struct pci_ops irongate_pci_ops;
extern int irongate_pci_clr_err(void); extern int irongate_pci_clr_err(void);
extern void irongate_init_arch(void); extern void irongate_init_arch(void);
extern void irongate_machine_check(u64, u64, struct pt_regs *); extern void irongate_machine_check(u64, u64);
#define irongate_pci_tbi ((void *)0) #define irongate_pci_tbi ((void *)0)
/* core_lca.c */ /* core_lca.c */
......
...@@ -204,7 +204,7 @@ static struct hw_interrupt_type titan_irq_type = { ...@@ -204,7 +204,7 @@ static struct hw_interrupt_type titan_irq_type = {
}; };
static irqreturn_t static irqreturn_t
titan_intr_nop(int irq, void *dev_id, struct pt_regs *regs) titan_intr_nop(int irq, void *dev_id)
{ {
/* /*
* This is a NOP interrupt handler for the purposes of * This is a NOP interrupt handler for the purposes of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment