summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-11 17:37:21 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 13:18:45 +0900
commite32acaf601445ddc4baa52a1e4df638543455029 (patch)
tree5772f6d9d9a1c20ae0057e5816440748c8c4a521 /arch/sh
parentfcfdd0f14f94d47f2f650a24cd111e11475ccada (diff)
downloadlinux-e32acaf601445ddc4baa52a1e4df638543455029.tar.gz
linux-e32acaf601445ddc4baa52a1e4df638543455029.tar.bz2
linux-e32acaf601445ddc4baa52a1e4df638543455029.zip
sh: Kill off lib64 version of iomap wrappers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/lib64/Makefile2
-rw-r--r--arch/sh/lib64/iomap.c54
2 files changed, 1 insertions, 55 deletions
diff --git a/arch/sh/lib64/Makefile b/arch/sh/lib64/Makefile
index c8c7cf4e8b48..2f4086ac6f99 100644
--- a/arch/sh/lib64/Makefile
+++ b/arch/sh/lib64/Makefile
@@ -11,5 +11,5 @@
# Panic should really be compiled as PIC
lib-y := udelay.o c-checksum.o dbg.o panic.o memcpy.o copy_user_memcpy.o \
- page_copy.o page_clear.o iomap.o
+ page_copy.o page_clear.o
diff --git a/arch/sh/lib64/iomap.c b/arch/sh/lib64/iomap.c
deleted file mode 100644
index 253d1e351d49..000000000000
--- a/arch/sh/lib64/iomap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * arch/sh64/lib/iomap.c
- *
- * Generic sh64 iomap interface
- *
- * Copyright (C) 2004 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/pci.h>
-#include <asm/io.h>
-
-void __iomem *__attribute__ ((weak))
-ioport_map(unsigned long port, unsigned int len)
-{
- return (void __iomem *)port;
-}
-EXPORT_SYMBOL(ioport_map);
-
-void ioport_unmap(void __iomem *addr)
-{
- /* Nothing .. */
-}
-EXPORT_SYMBOL(ioport_unmap);
-
-#ifdef CONFIG_PCI
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
- unsigned long start = pci_resource_start(dev, bar);
- unsigned long len = pci_resource_len(dev, bar);
- unsigned long flags = pci_resource_flags(dev, bar);
-
- if (!len)
- return NULL;
- if (max && len > max)
- len = max;
- if (flags & IORESOURCE_IO)
- return ioport_map(start + pciio_virt, len);
- if (flags & IORESOURCE_MEM)
- return (void __iomem *)start;
-
- /* What? */
- return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-{
- /* Nothing .. */
-}
-EXPORT_SYMBOL(pci_iounmap);
-#endif