Merge branch 'picoxcell/cleanup' into next/cleanup
Olof Johansson [Tue, 20 Dec 2011 05:12:24 +0000 (21:12 -0800)]
* 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

1  2 
MAINTAINERS
arch/arm/kernel/perf_event.c
arch/arm/mach-at91/setup.c
mm/vmalloc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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;
diff --cc mm/vmalloc.c
Simple merge