Merge with ../linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-netstar.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap1/board-perseus2.c
index 1670146,354b157..bd900b7
--- 1/arch/arm/mach-omap1/board-perseus2.c
--- 2/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@@ -148,10 -131,15 +148,14 @@@ void omap_perseus2_init_irq(void
        omap_gpio_init();
        perseus2_init_smc91x();
  }
 -
  /* Only FPGA needs to be mapped here. All others are done with ioremap */
  static struct map_desc omap_perseus2_io_desc[] __initdata = {
-       {H2P2_DBG_FPGA_BASE, H2P2_DBG_FPGA_START, H2P2_DBG_FPGA_SIZE,
-        MT_DEVICE},
+       {
+               .virtual        = H2P2_DBG_FPGA_BASE,
+               .pfn            = __phys_to_pfn(H2P2_DBG_FPGA_START),
+               .length         = H2P2_DBG_FPGA_SIZE,
+               .type           = MT_DEVICE
+       }
  };
  
  static void __init omap_perseus2_map_io(void)

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap1/io.c
index e72d267,79fb865..a7a19f7
--- 1/arch/arm/mach-omap1/io.c
--- 2/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@@ -37,10 -50,19 +51,19 @@@ static struct map_desc omap730_io_desc[
  };
  #endif
  
 -#ifdef CONFIG_ARCH_OMAP1510
 +#ifdef CONFIG_ARCH_OMAP15XX
  static struct map_desc omap1510_io_desc[] __initdata = {
-  { OMAP1510_DSP_BASE,    OMAP1510_DSP_START,    OMAP1510_DSP_SIZE,    MT_DEVICE },
-  { OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
+       {
+               .virtual        = OMAP1510_DSP_BASE,
+               .pfn            = __phys_to_pfn(OMAP1510_DSP_START),
+               .length         = OMAP1510_DSP_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = OMAP1510_DSPREG_BASE,
+               .pfn            = __phys_to_pfn(OMAP1510_DSPREG_START),
+               .length         = OMAP1510_DSPREG_SIZE,
+               .type           = MT_DEVICE
+       }
  };
  #endif
  

diff --cc arch/arm/plat-omap/clock.c
Simple merge

diff --cc arch/arm/plat-omap/usb.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
index 0c4a062,fdf4370..da5a65c
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -659,19 -659,9 +659,19 @@@ config HW_RANDO
  
          If unsure, say N.
  
 +config OMAP_RNG
 +      tristate "OMAP Random Number Generator support"
 +      depends on ARCH_OMAP16XX || ARCH_OMAP24XX
 +      ---help---
 +        This driver provides kernel-side support for the Random Number
 +        Generator hardware found on OMAP16xx and OMAP24xx multimedia
 +        processors.
 +
 +        If unsure, say N.
 +
  config NVRAM
        tristate "/dev/nvram support"
-       depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+       depends on ATARI || X86 || ARM || GENERIC_NVRAM
        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/chips/Kconfig
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

diff --cc drivers/i2c/chips/tps65010.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/mmc/Kconfig
Simple merge

diff --cc drivers/mmc/mmc.c
Simple merge

diff --cc drivers/mtd/maps/omap_nor.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
index 88cc956,1fc4c13..cc31113
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -49,15 -49,9 +49,15 @@@ config MTD_NAND_SPI
        help
          If you had to ask, you don't have one. Say 'N'.
  
 +config MTD_NAND_OMAP
 +        tristate "NAND Flash device on OMAP H3/H2/P2 or NETSTAR boards"
 +      depends on ARM && ARCH_OMAP1 && MTD_NAND && (MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_NETSTAR || MACH_OMAP_PERSEUS2)
 +        help
 +          Support for NAND flash on Texas Instruments H3/H2/P2/NETSTAR platforms.
 +
  config MTD_NAND_TOTO
        tristate "NAND Flash device on TOTO board"
-       depends on ARM && ARCH_OMAP && MTD_NAND
+       depends on ARCH_OMAP && MTD_NAND
        help
          Support for NAND flash on Texas Instruments Toto platform.
  

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/net/irda/Makefile
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

diff --cc drivers/pcmcia/omap_cf.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
index 1379b8f,e46cc54..167e95e
--- 1/drivers/usb/host/ohci-omap.c
--- 2/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@@ -513,9 -494,9 +499,10 @@@ static int ohci_omap_resume(struct devi
  /*
   * Driver definition to register with the OMAP bus
   */
 +MODULE_ALIAS("ohci");
  static struct device_driver ohci_hcd_omap_driver = {
        .name           = "ohci",
+       .owner          = THIS_MODULE,
        .bus            = &platform_bus_type,
        .probe          = ohci_hcd_omap_drv_probe,
        .remove         = ohci_hcd_omap_drv_remove,

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc include/asm-arm/arch-omap/io.h
Simple merge

diff --cc include/asm-arm/arch-omap/memory.h
Simple merge

diff --cc include/asm-arm/dma-mapping.h
Simple merge

diff --cc include/linux/fb.h
Simple merge

diff --cc include/linux/input.h
Simple merge

diff --cc kernel/printk.c
Simple merge