diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:58:53 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:58:53 (GMT) |
commit | a3a3c4664184f86ef964323d106c62158e2b3f25 (patch) | |
tree | a9b10a59f5ad8c2ac0196fca9b4e1eeaf75dbb4b /arch/arm/mach-davinci/board-dm365-evm.c | |
parent | 96a3eab338c01e172745b1686c51c1be96ce9ead (diff) | |
parent | 6ea96e111e6a7f06ef62227bf64e8cd65bd705b3 (diff) | |
download | linux-fsl-qoriq-a3a3c4664184f86ef964323d106c62158e2b3f25.tar.xz |
Merge branch 'davinci/cleanups' into next/cleanup
* davinci/cleanups:
ARM: davinci: add back dummy header files
ARM: davinci: dm644x: don't force vpfe registeration on all boards
ARM: davinci: dm644x: fix inconsistent variable naming
ARM: davinci: dm644x: improve readability using macro
ARM: davinci: streamline sysmod access
ARM: davinci: create new common platform header for davinci
ARM: davinci: dm646x: move private definitions to C file
ARM: davinci: dm365: move private definitions to C file
ARM: davinci: dm644x: move private definitions to C file
Conflicts:
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-neuros-osd2.c
arch/arm/mach-davinci/board-sffsdr.c
Diffstat (limited to 'arch/arm/mach-davinci/board-dm365-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 849311d..5bce2b8 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -32,7 +32,6 @@ #include <asm/mach/arch.h> #include <mach/mux.h> -#include <mach/dm365.h> #include <mach/common.h> #include <mach/i2c.h> #include <mach/serial.h> @@ -42,6 +41,8 @@ #include <media/tvp514x.h> +#include "davinci.h" + static inline int have_imager(void) { /* REVISIT when it's supported, trigger via Kconfig */ |