Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / powerpc / kernel / iomap.c

diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index fd8214caedeedcdcfc4b44a660669ee2a9cda543..a13a93dfc65539e7a70ef75baab047bcb250e277 100644 (file)
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -106,8 +106,6 @@ EXPORT_SYMBOL(iowrite32_rep);
 
 void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-       if (!_IO_IS_VALID(port))
-               return NULL;
        return (void __iomem *) (port+pci_io_base);
 }