summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-dm644x-evm.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 22:32:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 22:32:05 -0300
commiteabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch)
tree31f1ca0c0f6d027839d3d5915cf890400a52168a /arch/arm/mach-davinci/board-dm644x-evm.c
parentc421a1e418b191c8fb632dc5261b61acec6541ca (diff)
parent436d42c61c3eef1d02256174c8615046c61a28ad (diff)
downloadop-kernel-dev-eabe7b01c249c9d8166a1a10bb6effce2b3de665.zip
op-kernel-dev-eabe7b01c249c9d8166a1a10bb6effce2b3de665.tar.gz
Merge branch 'samsung_platform_data' into staging/for_v3.7
* samsung_platform_data: ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions
Diffstat (limited to 'arch/arm/mach-davinci/board-dm644x-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-dm644x-evm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index a79dc1e..f22572ce 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -32,13 +32,13 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
OpenPOWER on IntegriCloud