diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /include/asm-ppc/machdep.h | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'include/asm-ppc/machdep.h')
| -rw-r--r-- | include/asm-ppc/machdep.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 78f35e285..b47f36983 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -35,6 +35,10 @@ struct machdep_calls { unsigned long (*get_rtc_time)(void); void (*calibrate_decr)(void); + void (*heartbeat)(void); + unsigned long heartbeat_reset; + unsigned long heartbeat_count; + unsigned char (*nvram_read_val)(int addr); void (*nvram_write_val)(int addr, unsigned char val); @@ -49,7 +53,7 @@ struct machdep_calls { void (*kbd_leds)(unsigned char leds); void (*kbd_init_hw)(void); #ifdef CONFIG_MAGIC_SYSRQ - unsigned char *kbd_sysrq_xlate; + unsigned char *ppc_kbd_sysrq_xlate; #endif /* PCI interfaces */ |