X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-ixp4xx%2Fio.h;h=942b622455bc438ad2a164580ce190c03bcdeea4;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=b59520e56fc7fee72bc8262a08c9af2d8d690985;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h
index b59520e56..942b62245 100644
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
@@ -260,12 +260,6 @@ out:
 
 #endif
 
-#ifndef CONFIG_PCI
-
-#define	__io(v)		v
-
-#else
-
 /*
  * IXP4xx does not have a transparent cpu -> PCI I/O translation
  * window.  Instead, it has a set of registers that must be tweaked
@@ -584,7 +578,6 @@ __ixp4xx_iowrite32_rep(void __iomem *addr, const void *vaddr, u32 count)
 
 #define	ioport_map(port, nr)		((void __iomem*)(port + PIO_OFFSET))
 #define	ioport_unmap(addr)
-#endif	// !CONFIG_PCI
 
 #endif	//  __ASM_ARM_ARCH_IO_H