--- pmac_setup.c.orig	Fri Sep 24 18:27:25 1999
+++ pmac_setup.c	Fri Sep 24 18:29:27 1999
@@ -594,9 +594,15 @@
 	/* isa_io_base gets set in pmac_find_bridges */
 	isa_mem_base = PMAC_ISA_MEM_BASE;
 	pci_dram_offset = PMAC_PCI_DRAM_OFFSET;
+
+	/* These three variables don't seem to be used in pmac_setup.c and 
+	   aren't declared anywhere.  Do we need them at all?  They're 
+	   declared "unsigned long" in arch/ppc/kernel/setup.c */
+/*
 	ISA_DMA_THRESHOLD = ~0L;
 	DMA_MODE_READ = 1;
 	DMA_MODE_WRITE = 2;
+*/
 
 	ppc_md.setup_arch     = pmac_setup_arch;
 	ppc_md.setup_residual = NULL;