From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 05:12:24 +0000 (-0800)
Subject: Merge branch 'picoxcell/cleanup' into next/cleanup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=844e8a16f25568eefd02a6bfb40bdd9bc04704b8;p=linux-beck.git

Merge branch 'picoxcell/cleanup' into next/cleanup

* picoxcell/cleanup: (4 commits)
  MAINTAINERS: add maintainer entry for Picochip picoxcell
  ARM: picoxcell: move io mappings to common.c
  ARM: picoxcell: don't reserve irq_descs
  ARM: picoxcell: remove mach/memory.h

Conflicts:
	arch/arm/mach-at91/setup.c
---

844e8a16f25568eefd02a6bfb40bdd9bc04704b8
diff --cc arch/arm/mach-at91/setup.c
index 242c26b2368d,cf98a8f94dc5..8bdcc3cb6012
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -75,24 -73,9 +75,6 @@@ static struct map_desc at91_io_desc __i
  	.type		= MT_DEVICE,
  };
  
- void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
- {
- 	if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
- 		return (void __iomem *)AT91_IO_P2V(p);
- 
- 	return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
- }
- EXPORT_SYMBOL(at91_ioremap);
- 
- void at91_iounmap(volatile void __iomem *addr)
- {
- 	unsigned long virt = (unsigned long)addr;
- 
- 	if (virt >= VMALLOC_START && virt < VMALLOC_END)
- 		__iounmap(addr);
- }
- EXPORT_SYMBOL(at91_iounmap);
 -#define AT91_DBGU0	0xfffff200
 -#define AT91_DBGU1	0xffffee00
--
  static void __init soc_detect(u32 dbgu_base)
  {
  	u32 cidr, socid;