patch-2.3.9 linux/include/asm-ppc/machdep.h

Next file: linux/include/asm-ppc/page.h
Previous file: linux/include/asm-ppc/keyboard.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.8/linux/include/asm-ppc/machdep.h linux/include/asm-ppc/machdep.h
@@ -35,6 +35,10 @@
 	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 @@
 	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 */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)