---

yaml --- r: 283212 b: refs/heads/master c: 34f1bde h: refs/heads/master v: v3
git-mirror · Dec 4, 2011 · 36f207b · 36f207b
1 parent fa1aec7
commit 36f207b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 34 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ebf5d0d79087005e1042df2cd0f7594782746d8
+refs/heads/master: 34f1bdee1910f7efe3c32e1a891dba4fd21cb3b6
diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig
@@ -252,6 +252,7 @@ config PCI
 	bool "Use PCI"
 	depends on MN10300_UNIT_ASB2305
 	default y
+	select GENERIC_PCI_IOMAP
 	help
 	  Some systems (such as the ASB2305) have PCI onboard. If you have one
 	  of these boards and you wish to use the PCI facilities, say Y here.

diff --git a/trunk/arch/mn10300/include/asm/io.h b/trunk/arch/mn10300/include/asm/io.h
@@ -229,7 +229,6 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
 
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
 {
 }

diff --git a/trunk/arch/mn10300/unit-asb2305/Makefile b/trunk/arch/mn10300/unit-asb2305/Makefile
@@ -5,4 +5,4 @@
 ###############################################################################
 obj-y   := unit-init.o leds.o
 
-obj-$(CONFIG_PCI) += pci.o pci-asb2305.o pci-irq.o pci-iomap.o
+obj-$(CONFIG_PCI) += pci.o pci-asb2305.o pci-irq.o
diff --git a/trunk/arch/mn10300/unit-asb2305/pci-iomap.c b/trunk/arch/mn10300/unit-asb2305/pci-iomap.c