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-Tag: next-20110726~87^2~6^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d09a938861ef16248334d57ae250e109b0004ae;p=karo-tx-linux.git

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

4d09a938861ef16248334d57ae250e109b0004ae
diff --cc arch/arm/mach-ux500/board-mop500.c
index 2a08c07dec6d,2a08c07dec6d,bb26f40493e6,2a08c07dec6d,2a08c07dec6d,2a08c07dec6d,4eead1a0786b..cd54abaccd96
--- 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>