summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-sffsdr.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 14:58:53 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-27 14:58:53 +0000
commita3a3c4664184f86ef964323d106c62158e2b3f25 (patch)
treea9b10a59f5ad8c2ac0196fca9b4e1eeaf75dbb4b /arch/arm/mach-davinci/board-sffsdr.c
parent96a3eab338c01e172745b1686c51c1be96ce9ead (diff)
parent6ea96e111e6a7f06ef62227bf64e8cd65bd705b3 (diff)
downloadblackbird-op-linux-a3a3c4664184f86ef964323d106c62158e2b3f25.tar.gz
blackbird-op-linux-a3a3c4664184f86ef964323d106c62158e2b3f25.zip
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-sffsdr.c')
-rw-r--r--arch/arm/mach-davinci/board-sffsdr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 31da3c5b2ba3..76e675096104 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -35,13 +35,14 @@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-#include <mach/dm644x.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include <mach/usb.h>
+#include "davinci.h"
+
#define SFFSDR_PHY_ID "davinci_mdio-0:01"
static struct mtd_partition davinci_sffsdr_nandflash_partition[] = {
/* U-Boot Environment: Block 0
OpenPOWER on IntegriCloud