diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-04 05:59:07 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 05:59:07 +0100 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /include/asm-mips/sibyte/sb1250.h | |
| parent | [PATCH] ppc: Fix io.h for config with CONFIG_PCI not set (diff) | |
| parent | [XFRM]: Fix aevent structuring to be more complete. (diff) | |
| download | linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.tar.xz linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.zip | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'include/asm-mips/sibyte/sb1250.h')
| -rw-r--r-- | include/asm-mips/sibyte/sb1250.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/sibyte/sb1250.h b/include/asm-mips/sibyte/sb1250.h index b09e16c93ca0..2ba6988ddc8e 100644 --- a/include/asm-mips/sibyte/sb1250.h +++ b/include/asm-mips/sibyte/sb1250.h @@ -51,8 +51,8 @@ extern void sb1250_mask_irq(int cpu, int irq); extern void sb1250_unmask_irq(int cpu, int irq); extern void sb1250_smp_finish(void); +extern void bcm1480_hpt_setup(void); extern void bcm1480_time_init(void); -extern unsigned long bcm1480_gettimeoffset(void); extern void bcm1480_mask_irq(int cpu, int irq); extern void bcm1480_unmask_irq(int cpu, int irq); extern void bcm1480_smp_finish(void); |