From: Tony Lindgren <tony@atomide.com>
Date: Fri, 20 Jan 2012 13:31:52 +0000 (-0800)
Subject: Merge branch 'omap1-part2' into omap1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=967809bd7faf71ddc29c8081e0f21db8b201a0f4;p=linux.git

Merge branch 'omap1-part2' into omap1

Conflicts:
	drivers/leds/leds-ams-delta.c
---

967809bd7faf71ddc29c8081e0f21db8b201a0f4
diff --cc arch/arm/mach-omap1/board-ams-delta.c
index 88909cc0b2540,673cf21a90f88..87b13039f9367
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-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);