| From 25b8451b27d8d3065376771fb2f1a2461b7a07d7 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 31 Oct 2013 18:00:03 -0700 |
| Subject: 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> |
| (cherry picked from commit 2f3927e815e82874af76db51f8d2c2a596bc6cee) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-marzen.c | 1 + |
| arch/arm/mach-shmobile/include/mach/r8a7779.h | 1 - |
| 2 files changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c |
| index fa102f7d149c..4f9e3ec42ddc 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 905420a2f11f..1cab247ff255 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 { |
| -- |
| 1.8.5.rc3 |
| |
