summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-31 18:00:03 -0700
committerSimon Horman <horms+renesas@verge.net.au>2013-11-24 15:14:31 +0900
commit2f3927e815e82874af76db51f8d2c2a596bc6cee (patch)
treec05afdb385c653feb45da6693a344eb5e2b413c9
parent8d0b3bf79bfa1dc7d3e2a9dc2b6f2ceea353687f (diff)
downloadop-kernel-dev-2f3927e815e82874af76db51f8d2c2a596bc6cee.zip
op-kernel-dev-2f3927e815e82874af76db51f8d2c2a596bc6cee.tar.gz
ARM: shmobile: r8a7779: camera-rcar header cleanup
<linux/platform_data/camera-rcar.h> is needed on Marzen, not setup-r8a7779.c Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c1
-rw-r--r--arch/arm/mach-shmobile/include/mach/r8a7779.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index fa102f7..4f9e3ec 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -29,6 +29,7 @@
#include <linux/leds.h>
#include <linux/dma-mapping.h>
#include <linux/pinctrl/machine.h>
+#include <linux/platform_data/camera-rcar.h>
#include <linux/platform_data/gpio-rcar.h>
#include <linux/platform_data/rcar-du.h>
#include <linux/platform_data/usb-rcar-phy.h>
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index 905420a..1cab247 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -4,7 +4,6 @@
#include <linux/sh_clk.h>
#include <linux/pm_domain.h>
#include <linux/sh_eth.h>
-#include <linux/platform_data/camera-rcar.h>
/* HPB-DMA slave IDs */
enum {
OpenPOWER on IntegriCloud