From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 17 Jul 2011 19:31:38 +0000 (+0200)
Subject: Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=4d09a938861ef16248334d57ae250e109b0004ae;p=linux-edison.git

Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh:///linux/kernel/git/arm/linux-arm-soc into next/devel
---

4d09a938861ef16248334d57ae250e109b0004ae
diff --cc arch/arm/mach-ux500/board-mop500.c
index 2a08c07dec6,2a08c07dec6,bb26f40493e,2a08c07dec6,2a08c07dec6,2a08c07dec6,4eead1a0786..cd54abaccd9
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@@@@@@ -26,9 -26,9 -26,8 -26,9 -26,9 -26,9 -26,10 +26,11 @@@@@@@@
       #include <linux/mfd/ab8500/gpio.h>
       #include <linux/leds-lp5521.h>
       #include <linux/input.h>
++++++ #include <linux/smsc911x.h>
       #include <linux/gpio_keys.h>
  +   +#include <linux/delay.h>
       
++++++ #include <linux/leds.h>
       #include <asm/mach-types.h>
       #include <asm/mach/arch.h>