From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 6 May 2007 19:58:29 +0000 (+0100)
Subject: Merge branch 'ixp4xx' into devel
X-Git-Tag: v2.6.22-rc1~1009^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5cd47155155a32e5b944ac9fc3f3dc578e429aa0;p=linux-2.6-omap-h63xx.git

Merge branch 'ixp4xx' into devel

Conflicts:

	include/asm-arm/arch-ixp4xx/io.h
---

5cd47155155a32e5b944ac9fc3f3dc578e429aa0
diff --cc include/asm-arm/arch-ixp4xx/io.h
index b27c910adf9,b8b3cbcd2d3..c72f9d79417
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
@@@ -59,10 -59,10 +59,10 @@@ extern int ixp4xx_pci_write(u32 addr, u
   * fallback to the default.
   */
  static inline void __iomem *
 -__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned long flags)
 +__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned int mtype)
  {
- 	if((addr < 0x48000000) || (addr > 0x4fffffff))
+ 	if((addr < PCIBIOS_MIN_MEM) || (addr > 0x4fffffff))
 -		return __ioremap(addr, size, flags);
 +		return __arm_ioremap(addr, size, mtype);
  
  	return (void *)addr;
  }