| From f734a5c5a56a1156a516586a9f6f8671f355e23f Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 5 Dec 2013 18:09:30 -0800 |
| Subject: ARM: shmobile: r8a7778: camera-rcar header cleanup |
| |
| <linux/platform_data/camera-rcar.h> is needed on BockW, |
| not setup-r8a7778.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 02d39132e75410633c637be006b9b772a6116da3) |
| (Queued by Simon Horman 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-bockw.c | 1 + |
| arch/arm/mach-shmobile/include/mach/r8a7778.h | 1 - |
| 2 files changed, 1 insertion(+), 1 deletion(-) |
| |
| 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> |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| index a3440e50fafa..72c9d37d377d 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| @@ -20,7 +20,6 @@ |
| #define __ASM_R8A7778_H__ |
| |
| #include <linux/sh_eth.h> |
| -#include <linux/platform_data/camera-rcar.h> |
| |
| /* HPB-DMA slave IDs */ |
| enum { |
| -- |
| 1.8.5.rc3 |
| |
