diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-ppc/gt64260.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-ppc/gt64260.h')
| -rw-r--r-- | include/asm-ppc/gt64260.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/gt64260.h b/include/asm-ppc/gt64260.h index cd0ef644943d..9e63b3cfffca 100644 --- a/include/asm-ppc/gt64260.h +++ b/include/asm-ppc/gt64260.h | |||
| @@ -315,7 +315,7 @@ int gt64260_get_base(u32 *base); | |||
| 315 | int gt64260_pci_exclude_device(u8 bus, u8 devfn); | 315 | int gt64260_pci_exclude_device(u8 bus, u8 devfn); |
| 316 | 316 | ||
| 317 | void gt64260_init_irq(void); | 317 | void gt64260_init_irq(void); |
| 318 | int gt64260_get_irq(struct pt_regs *regs); | 318 | int gt64260_get_irq(void); |
| 319 | 319 | ||
| 320 | void gt64260_mpsc_progress(char *s, unsigned short hex); | 320 | void gt64260_mpsc_progress(char *s, unsigned short hex); |
| 321 | 321 | ||