diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-mips/sibyte/sb1250.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
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); | |||
| 51 | extern void sb1250_unmask_irq(int cpu, int irq); | 51 | extern void sb1250_unmask_irq(int cpu, int irq); |
| 52 | extern void sb1250_smp_finish(void); | 52 | extern void sb1250_smp_finish(void); |
| 53 | 53 | ||
| 54 | extern void bcm1480_hpt_setup(void); | ||
| 54 | extern void bcm1480_time_init(void); | 55 | extern void bcm1480_time_init(void); |
| 55 | extern unsigned long bcm1480_gettimeoffset(void); | ||
| 56 | extern void bcm1480_mask_irq(int cpu, int irq); | 56 | extern void bcm1480_mask_irq(int cpu, int irq); |
| 57 | extern void bcm1480_unmask_irq(int cpu, int irq); | 57 | extern void bcm1480_unmask_irq(int cpu, int irq); |
| 58 | extern void bcm1480_smp_finish(void); | 58 | extern void bcm1480_smp_finish(void); |