aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/iomap.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2006-04-07 01:23:03 -0400
committerPaul Mackerras <paulus@samba.org>2006-04-22 04:45:05 -0400
commitc256f4b9598c71afd8eb0b7d3d3790a38734cf43 (patch)
tree7366b0e03b5d9f1b0abfaa38230246f6d3875735 /arch/powerpc/kernel/iomap.c
parent81bbbe92949b069c101e13d3acbd4bc7d088cb79 (diff)
[PATCH] powerpc: remove io_page_mask
Cleanup patch which removes the io_page_mask. It fixes the reset on some e1000 devices which is needed for clean kexec reboots. The legacy devices which broke with this patch (parallel port and PC speaker) have now been fixed in Linus' tree. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/iomap.c')
-rw-r--r--arch/powerpc/kernel/iomap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index fd8214caede..a13a93dfc65 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -106,8 +106,6 @@ EXPORT_SYMBOL(iowrite32_rep);
106 106
107void __iomem *ioport_map(unsigned long port, unsigned int len) 107void __iomem *ioport_map(unsigned long port, unsigned int len)
108{ 108{
109 if (!_IO_IS_VALID(port))
110 return NULL;
111 return (void __iomem *) (port+pci_io_base); 109 return (void __iomem *) (port+pci_io_base);
112} 110}
113 111