diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-10-31 18:00:03 -0700 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-11-24 15:14:31 +0900 |
| commit | 2f3927e815e82874af76db51f8d2c2a596bc6cee (patch) | |
| tree | c05afdb385c653feb45da6693a344eb5e2b413c9 | |
| parent | 8d0b3bf79bfa1dc7d3e2a9dc2b6f2ceea353687f (diff) | |
| download | talos-op-linux-2f3927e815e82874af76db51f8d2c2a596bc6cee.tar.gz talos-op-linux-2f3927e815e82874af76db51f8d2c2a596bc6cee.zip | |
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.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7779.h | 1 |
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 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 { |
