diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
| commit | eabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch) | |
| tree | 31f1ca0c0f6d027839d3d5915cf890400a52168a /arch/arm/mach-davinci/board-dm644x-evm.c | |
| parent | c421a1e418b191c8fb632dc5261b61acec6541ca (diff) | |
| parent | 436d42c61c3eef1d02256174c8615046c61a28ad (diff) | |
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.c | 10 |
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 a79dc1e7cf72..f22572cee49d 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
| @@ -32,13 +32,13 @@ | |||
| 32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
| 33 | 33 | ||
| 34 | #include <mach/common.h> | 34 | #include <mach/common.h> |
| 35 | #include <mach/i2c.h> | 35 | #include <linux/platform_data/i2c-davinci.h> |
| 36 | #include <mach/serial.h> | 36 | #include <mach/serial.h> |
| 37 | #include <mach/mux.h> | 37 | #include <mach/mux.h> |
| 38 | #include <mach/nand.h> | 38 | #include <linux/platform_data/mtd-davinci.h> |
| 39 | #include <mach/mmc.h> | 39 | #include <linux/platform_data/mmc-davinci.h> |
| 40 | #include <mach/usb.h> | 40 | #include <linux/platform_data/usb-davinci.h> |
| 41 | #include <mach/aemif.h> | 41 | #include <linux/platform_data/mtd-davinci-aemif.h> |
| 42 | 42 | ||
| 43 | #include "davinci.h" | 43 | #include "davinci.h" |
| 44 | 44 | ||