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

Next file: linux/arch/ppc/kernel/ppc_ksyms.c
Previous file: linux/arch/ppc/kernel/pmac_setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.25/linux/arch/ppc/kernel/pmac_support.c linux/arch/ppc/kernel/pmac_support.c
@@ -60,6 +60,7 @@
 	struct adb_request req;
 
 	switch (nvram_naddrs) {
+#ifdef CONFIG_ADB_PMU
 	case -1:
 		if (pmu_request(&req, NULL, 3, PMU_READ_NVRAM,
 				(addr >> 8) & 0xff, addr & 0xff))
@@ -67,6 +68,7 @@
 		while (!req.complete)
 			pmu_poll();
 		return req.reply[1];
+#endif
 	case 1:
 		return nvram_data[(addr & (NVRAM_SIZE - 1)) * nvram_mult];
 	case 2:
@@ -82,6 +84,7 @@
 	struct adb_request req;
 
 	switch (nvram_naddrs) {
+#ifdef CONFIG_ADB_PMU
 	case -1:
 		if (pmu_request(&req, NULL, 4, PMU_WRITE_NVRAM,
 				(addr >> 8) & 0xff, addr & 0xff, val))
@@ -89,6 +92,7 @@
 		while (!req.complete)
 			pmu_poll();
 		break;
+#endif
 	case 1:
 		nvram_data[(addr & (NVRAM_SIZE - 1)) * nvram_mult] = val;
 		break;

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