diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 11:08:11 +0100 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 11:08:11 +0100 |
commit | 70d4f2e5576a16120e6bc85b10011032306c1179 (patch) | |
tree | 8fe170b96167ab3aeb82980d58828942fe11668a /arch/arm/mach-shmobile/board-bockw.c | |
parent | ARM: shmobile: lager: add gpio/fixed regulator for SDHI (diff) | |
parent | arm: shmobile: clks: remove duplicated clock from r7s72100 (diff) | |
download | linux-70d4f2e5576a16120e6bc85b10011032306c1179.tar.xz linux-70d4f2e5576a16120e6bc85b10011032306c1179.zip |
Merge branch 'heads/soc2' into boards2-base
Diffstat (limited to 'arch/arm/mach-shmobile/board-bockw.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-bockw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index eb5b54fc5cc9..afb3f6869017 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -25,6 +25,7 @@ #include <linux/mmc/sh_mmcif.h> #include <linux/mtd/partitions.h> #include <linux/pinctrl/machine.h> +#include <linux/platform_data/camera-rcar.h> #include <linux/platform_data/usb-rcar-phy.h> #include <linux/platform_device.h> #include <linux/regulator/fixed.h> |