patch-2.3.20 linux/arch/ppc/kernel/pmac_support.c

• Lines: 33
• Date: Thu Oct 7 10:17:08 1999
• Orig file: v2.3.19/linux/arch/ppc/kernel/pmac_support.c
• Orig date: Tue Aug 31 17:29:13 1999

diff -u --recursive --new-file v2.3.19/linux/arch/ppc/kernel/pmac_support.c linux/arch/ppc/kernel/pmac_support.c
@@ -12,8 +12,8 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/prom.h>
-#include <asm/adb.h>
-#include <asm/pmu.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
 
 /*
  * Read and write the non-volatile RAM on PowerMacs and CHRP machines.
@@ -47,7 +47,7 @@
 	} else if (nvram_naddrs == 2) {
 		nvram_addr = ioremap(dp->addrs[0].address, dp->addrs[0].size);
 		nvram_data = ioremap(dp->addrs[1].address, dp->addrs[1].size);
-	} else if (nvram_naddrs == 0 && adb_hardware == ADB_VIAPMU) {
+	} else if (nvram_naddrs == 0 && sys_ctrler == SYS_CTRLER_PMU) {
 		nvram_naddrs = -1;
 	} else {
 		printk(KERN_ERR "Don't know how to access NVRAM with %d addresses\n",
@@ -55,6 +55,7 @@
 	}
 }
 
+#ifdef CONFIG_NVRAM
 unsigned char nvram_read_byte(int addr)
 {
 	struct adb_request req;
@@ -100,3 +101,4 @@
 	}
 	eieio();
 }
+#endif /* CONFIG_NVRAM */