Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Kyle McMartin [Sat, 17 Feb 2007 05:18:23 +0000 (00:18 -0500)]
Conflicts:

arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c

1  2 
arch/parisc/hpux/sys_hpux.c
arch/parisc/kernel/smp.c
arch/parisc/mm/ioremap.c
drivers/net/Kconfig
drivers/serial/mux.c
scripts/mod/modpost.c

Simple merge
Simple merge
   */
  void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
  {
-       void *addr;
+       void __iomem *addr;
        struct vm_struct *area;
        unsigned long offset, last_addr;
 +      pgprot_t pgprot;
  
  #ifdef CONFIG_EISA
        unsigned long end = phys_addr + size - 1;
        if (!area)
                return NULL;
  
-       addr = area->addr;
+       addr = (void __iomem *) area->addr;
 -      if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
 +      if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
 +                             phys_addr, pgprot)) {
                vfree(addr);
                return NULL;
        }
Simple merge
Simple merge
Simple merge