diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:26:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:33:38 +0100 |
| commit | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (patch) | |
| tree | 380bcc1d77acc968e9ae9c8da9215b8b04edba1f /arch/arm/mach-shmobile/board-ag5evm.c | |
| parent | ARM: shmobile: remove additional __io() macro use (diff) | |
| parent | ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo (diff) | |
| download | linux-5cd9eb2736a572a9ef2689829f47ffd4262adc00.tar.xz linux-5cd9eb2736a572a9ef2689829f47ffd4262adc00.zip | |
Merge branch 'renesas/fixes' into renesas/soc
The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.
Conflicts:
arch/arm/mach-shmobile/board-mackerel.c
Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ag5evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index 675660d951d0..bd7953b59a84 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -38,6 +38,7 @@ #include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mfd/tmio.h> #include <linux/sh_clk.h> +#include <linux/videodev2.h> #include <video/sh_mobile_lcdc.h> #include <video/sh_mipi_dsi.h> #include <sound/sh_fsi.h> |