Merge branch 'omap1-part2' into omap1
authorTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
Conflicts:
drivers/leds/leds-ams-delta.c

1  2 
arch/arm/mach-omap1/board-ams-delta.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mtd/nand/ams-delta.c
drivers/video/omap/lcd_ams_delta.c
sound/soc/omap/ams-delta.c

@@@ -386,8 -537,4 +537,5 @@@ MACHINE_START(AMS_DELTA, "Amstrad E3 (D
        .init_irq       = omap1_init_irq,
        .init_machine   = ams_delta_init,
        .timer          = &omap1_timer,
 +      .restart        = omap1_restart,
  MACHINE_END
- EXPORT_SYMBOL(ams_delta_latch1_write);
- EXPORT_SYMBOL(ams_delta_latch2_write);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge