From 759b6055de8d6df7bba12ba1666b3861509b6744 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Sun, 8 Jan 2006 01:01:22 -0800
Subject: [PATCH] --- yaml --- r: 16871 b: refs/heads/master c:
 a2a88f88782e8815cafa22f2b9e22234b9a61d0a h: refs/heads/master i:   16869:
 47c7ace7afdaa4c18c9d599b55abba0a84ee1293   16867:
 b1ad089943deb9621a26ccc98a86ed102c9e8990   16863:
 9ab9b60d63bbe9fd2cb60d7d18a17251ae31c852 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/frv/mb93090-mb00/Makefile    |  2 +-
 trunk/arch/frv/mb93090-mb00/pci-iomap.c | 29 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/frv/mb93090-mb00/pci-iomap.c

diff --git a/[refs] b/[refs]
index e3943cc8890d..0750f9d955a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00d76710c253341b1e84795923e59ccdb099628f
+refs/heads/master: a2a88f88782e8815cafa22f2b9e22234b9a61d0a
diff --git a/trunk/arch/frv/mb93090-mb00/Makefile b/trunk/arch/frv/mb93090-mb00/Makefile
index 3faf0f8cf9b5..76595e870733 100644
--- a/trunk/arch/frv/mb93090-mb00/Makefile
+++ b/trunk/arch/frv/mb93090-mb00/Makefile
@@ -3,7 +3,7 @@
 #
 
 ifeq "$(CONFIG_PCI)" "y"
-obj-y := pci-frv.o pci-irq.o pci-vdk.o
+obj-y := pci-frv.o pci-irq.o pci-vdk.o pci-iomap.o
 
 ifeq "$(CONFIG_MMU)" "y"
 obj-y += pci-dma.o
diff --git a/trunk/arch/frv/mb93090-mb00/pci-iomap.c b/trunk/arch/frv/mb93090-mb00/pci-iomap.c
new file mode 100644
index 000000000000..068fa04bd527
--- /dev/null
+++ b/trunk/arch/frv/mb93090-mb00/pci-iomap.c
@@ -0,0 +1,29 @@
+/* pci-iomap.c: description
+ *
+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <linux/pci.h>
+#include <linux/module.h>
+
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+	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 || !start)
+		return NULL;
+
+	if ((flags & IORESOURCE_IO) || (flags & IORESOURCE_MEM))
+		return (void __iomem *) start;
+
+	return NULL;
+}
+
+EXPORT_SYMBOL(pci_iomap);