[parisc-linux-cvs] Re: 2.6.7-rc2-pa3 DIFF fix generic builds broken by -pa2 commit

[Grant Grundler]

On Fri, Jun 04, 2004 at 04:54:14PM -0600, Grant Grundler wrote:
> 	.              : Makefile 
> 	drivers/parisc : iommu-helpers.h 

Only use ibase when iommu-helpers.h is compiled with SBA/ZX1 code.

grant


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.204
diff -u -p -r1.204 Makefile
--- Makefile	4 Jun 2004 19:36:52 -0000	1.204
+++ Makefile	4 Jun 2004 22:47:59 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION =-rc2-pa2
+EXTRAVERSION =-rc2-pa3
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
Index: drivers/parisc/iommu-helpers.h
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/parisc/iommu-helpers.h,v
retrieving revision 1.3
diff -u -p -r1.3 iommu-helpers.h
--- drivers/parisc/iommu-helpers.h	4 Jun 2004 19:36:53 -0000	1.3
+++ drivers/parisc/iommu-helpers.h	4 Jun 2004 22:48:01 -0000
@@ -49,7 +49,7 @@ iommu_fill_pdir(struct ioc *ioc, struct 
 			sg_dma_len(startsg) = 0;
 			dma_offset = (unsigned long) pide & ~IOVP_MASK;
 			n_mappings++;
-#if defined(__LP64__) && !defined(CONFIG_PDC_NARROW)
+#if defined(ZX1_SUPPORT)
 			/* Pluto IOMMU IO Virt Address is not zero based */
 			sg_dma_address(dma_sg) = pide | ioc->ibase;
 #else