diff -urbBw bk_devel/arch/ppc/kernel/pmac_nvram.c linuxppc_2_3/arch/ppc/kernel/pmac_nvram.c
--- bk_devel/arch/ppc/kernel/pmac_nvram.c	Mon Jul 10 08:18:43 2000
+++ linuxppc_2_3/arch/ppc/kernel/pmac_nvram.c	Thu Jul 13 01:27:12 2000
@@ -70,6 +70,7 @@
 
 extern int pmac_newworld;
 
+extern sys_ctrler_t sys_ctrler ;
 
 static u8
 chrp_checksum(struct chrp_header* hdr)
diff -urbBw bk_devel/arch/ppc/kernel/pmac_setup.c linuxppc_2_3/arch/ppc/kernel/pmac_setup.c
--- bk_devel/arch/ppc/kernel/pmac_setup.c	Tue Jul 11 08:12:14 2000
+++ linuxppc_2_3/arch/ppc/kernel/pmac_setup.c	Thu Jul 13 01:00:39 2000
@@ -94,6 +94,8 @@
 extern void pckbd_init_hw(void);
 extern void pmac_nvram_update(void);
 
+sys_ctrler_t sys_ctrler = 0 ;
+
 unsigned char drive_info;
 
 int ppc_override_l2cr = 0;
diff -urbBw bk_devel/arch/ppc/kernel/pmac_time.c linuxppc_2_3/arch/ppc/kernel/pmac_time.c
--- bk_devel/arch/ppc/kernel/pmac_time.c	Wed Jun 28 07:58:24 2000
+++ linuxppc_2_3/arch/ppc/kernel/pmac_time.c	Thu Jul 13 01:29:13 2000
@@ -31,6 +31,8 @@
 
 extern rwlock_t xtime_lock;
 
+extern sys_ctrler_t sys_ctrler ;
+
 /* Apparently the RTC stores seconds since 1 Jan 1904 */
 #define RTC_OFFSET	2082844800
 
diff -urbBw bk_devel/arch/ppc/kernel/ppc_ksyms.c linuxppc_2_3/arch/ppc/kernel/ppc_ksyms.c
--- bk_devel/arch/ppc/kernel/ppc_ksyms.c	Mon Jul 10 08:18:43 2000
+++ linuxppc_2_3/arch/ppc/kernel/ppc_ksyms.c	Thu Jul 13 01:48:39 2000
@@ -61,6 +61,8 @@
 int abs(int);
 extern unsigned long ret_to_user_hook;
 
+extern sys_ctrler_t sys_ctrler ;
+
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(do_signal);
 EXPORT_SYMBOL(syscall_trace);
@@ -198,6 +200,8 @@
 EXPORT_SYMBOL(_machine);
 #endif
 EXPORT_SYMBOL(ppc_md);
+
+EXPORT_SYMBOL_NOVERS(sys_ctrler) ;
 
 #ifdef CONFIG_ADB
 /*
diff -urbBw bk_devel/arch/ppc/xmon/start.c linuxppc_2_3/arch/ppc/xmon/start.c
--- bk_devel/arch/ppc/xmon/start.c	Thu Jun  8 07:38:16 2000
+++ linuxppc_2_3/arch/ppc/xmon/start.c	Thu Jul 13 01:03:05 2000
@@ -27,6 +27,8 @@
 static int xmon_use_sccb = 0;
 static struct device_node *macio_node;
 
+extern sys_ctrler_t sys_ctrler ;
+
 #define TB_SPEED	25000000
 
 static inline unsigned int readtb(void)
diff -urbBw bk_devel/drivers/macintosh/via-cuda.c linuxppc_2_3/drivers/macintosh/via-cuda.c
--- bk_devel/drivers/macintosh/via-cuda.c	Wed Mar  1 20:30:33 2000
+++ linuxppc_2_3/drivers/macintosh/via-cuda.c	Thu Jul 13 01:06:25 2000
@@ -32,6 +32,10 @@
 
 static volatile unsigned char *via;
 
+#ifdef CONFIG_PPC
+extern sys_ctrler_t sys_ctrler ;
+#endif
+
 #ifdef CONFIG_MAC
 #define CUDA_IRQ IRQ_MAC_ADB
 #define __openfirmware
diff -urbBw bk_devel/drivers/macintosh/via-pmu.c linuxppc_2_3/drivers/macintosh/via-pmu.c
--- bk_devel/drivers/macintosh/via-pmu.c	Mon Jul 10 08:18:44 2000
+++ linuxppc_2_3/drivers/macintosh/via-pmu.c	Thu Jul 13 01:08:51 2000
@@ -156,6 +156,8 @@
 extern int grackle_pcibios_write_config_word(unsigned char bus,
 	unsigned char dev_fn, unsigned char offset, unsigned short val);
 
+extern sys_ctrler_t sys_ctrler ;
+
 /*
  * This table indicates for each PMU opcode:
  * - the number of data bytes to be sent with the command, or -1

diff -urbBw bk_devel/include/asm-ppc/machdep.h linuxppc_2_3/include/asm-ppc/machdep.h
--- bk_devel/include/asm-ppc/machdep.h	Wed Mar  1 20:27:12 2000
+++ linuxppc_2_3/include/asm-ppc/machdep.h	Thu Jul 13 00:55:27 2000
@@ -87,9 +87,9 @@
  * Power macintoshes have either a CUDA or a PMU controlling
  * system reset, power, NVRAM, RTC.
  */
-enum sys_ctrler_kind {
+typedef enum sys_ctrler_kind {
 	SYS_CTRLER_CUDA = 1,
 	SYS_CTRLER_PMU = 2,
-} sys_ctrler;
+} sys_ctrler_t ;
 
 #endif /* _PPC_MACHDEP_H */