aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-11-04 17:33:05 -0500
committerOlof Johansson <olof@lixom.net>2014-11-04 17:33:05 -0500
commita26c65112616353f193ef04973d38cfc06d963c6 (patch)
tree1c7ca58fa24c5ff81a47896aa6b025750f7c2a70
parenta49467ce0e6f57529bea6cc508158970b94ad70e (diff)
parentf4115f25c11790646351df243dae070a7cf80163 (diff)
Merge tag 'renesas-boards-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Boards Cleanups for v3.19" from Simon Horman: * Sort armadillo800eva includes * tag 'renesas-boards-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: armadillo800eva: Sort includes Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index e70983534403..f19459a8c3ed 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -22,43 +22,43 @@
22#include <linux/clk.h> 22#include <linux/clk.h>
23#include <linux/delay.h> 23#include <linux/delay.h>
24#include <linux/err.h> 24#include <linux/err.h>
25#include <linux/kernel.h>
26#include <linux/input.h>
27#include <linux/platform_data/st1232_pdata.h>
28#include <linux/irq.h>
29#include <linux/platform_device.h>
30#include <linux/gpio.h> 25#include <linux/gpio.h>
31#include <linux/gpio_keys.h> 26#include <linux/gpio_keys.h>
32#include <linux/regulator/driver.h> 27#include <linux/i2c-gpio.h>
28#include <linux/input.h>
29#include <linux/irq.h>
30#include <linux/kernel.h>
31#include <linux/mfd/tmio.h>
32#include <linux/mmc/host.h>
33#include <linux/mmc/sh_mmcif.h>
34#include <linux/mmc/sh_mobile_sdhi.h>
33#include <linux/pinctrl/machine.h> 35#include <linux/pinctrl/machine.h>
36#include <linux/platform_data/st1232_pdata.h>
37#include <linux/platform_device.h>
34#include <linux/pwm.h> 38#include <linux/pwm.h>
35#include <linux/pwm_backlight.h> 39#include <linux/pwm_backlight.h>
40#include <linux/reboot.h>
41#include <linux/regulator/driver.h>
36#include <linux/regulator/fixed.h> 42#include <linux/regulator/fixed.h>
37#include <linux/regulator/gpio-regulator.h> 43#include <linux/regulator/gpio-regulator.h>
38#include <linux/regulator/machine.h> 44#include <linux/regulator/machine.h>
39#include <linux/sh_eth.h> 45#include <linux/sh_eth.h>
40#include <linux/videodev2.h>
41#include <linux/usb/renesas_usbhs.h> 46#include <linux/usb/renesas_usbhs.h>
42#include <linux/mfd/tmio.h> 47#include <linux/videodev2.h>
43#include <linux/mmc/host.h>
44#include <linux/mmc/sh_mmcif.h>
45#include <linux/mmc/sh_mobile_sdhi.h>
46#include <linux/i2c-gpio.h>
47#include <linux/reboot.h>
48 48
49#include <media/mt9t112.h> 49#include <asm/hardware/cache-l2x0.h>
50#include <media/sh_mobile_ceu.h>
51#include <media/soc_camera.h>
52#include <asm/page.h>
53#include <asm/mach-types.h> 50#include <asm/mach-types.h>
54#include <asm/mach/arch.h> 51#include <asm/mach/arch.h>
55#include <asm/mach/map.h> 52#include <asm/mach/map.h>
56#include <asm/mach/time.h> 53#include <asm/mach/time.h>
57#include <asm/hardware/cache-l2x0.h> 54#include <asm/page.h>
58#include <video/sh_mobile_lcdc.h> 55#include <media/mt9t112.h>
59#include <video/sh_mobile_hdmi.h> 56#include <media/sh_mobile_ceu.h>
57#include <media/soc_camera.h>
60#include <sound/sh_fsi.h> 58#include <sound/sh_fsi.h>
61#include <sound/simple_card.h> 59#include <sound/simple_card.h>
60#include <video/sh_mobile_hdmi.h>
61#include <video/sh_mobile_lcdc.h>
62 62
63#include "common.h" 63#include "common.h"
64#include "irqs.h" 64#include "irqs.h"