--- zzzz-none-000/linux-2.6.19.2/drivers/net/ehea/ehea_phyp.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/net/ehea/ehea_phyp.h	2007-01-11 07:38:19.000000000 +0000
@@ -81,16 +81,14 @@
 static inline void hcp_epas_ctor(struct h_epas *epas, u64 paddr_kernel,
 				 u64 paddr_user)
 {
-	/* To support 64k pages we must round to 64k page boundary */
-	epas->kernel.addr = ioremap((paddr_kernel & PAGE_MASK), PAGE_SIZE) +
-			    (paddr_kernel & ~PAGE_MASK);
+	epas->kernel.addr = ioremap(paddr_kernel, PAGE_SIZE);
 	epas->user.addr = paddr_user;
 }
 
 static inline void hcp_epas_dtor(struct h_epas *epas)
 {
 	if (epas->kernel.addr)
-		iounmap((void __iomem*)((u64)epas->kernel.addr & PAGE_MASK));
+		iounmap(epas->kernel.addr);
 
 	epas->user.addr = 0;
 	epas->kernel.addr = 0;