diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 22:32:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 22:32:05 -0300 |
| commit | eabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch) | |
| tree | 31f1ca0c0f6d027839d3d5915cf890400a52168a /arch/arm/mach-davinci/board-da850-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-da850-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index bc6b8c7b86c3..32ee3f895967 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -40,10 +40,10 @@ #include <mach/cp_intc.h> #include <mach/da8xx.h> -#include <mach/nand.h> +#include <linux/platform_data/mtd-davinci.h> #include <mach/mux.h> -#include <mach/aemif.h> -#include <mach/spi.h> +#include <linux/platform_data/mtd-davinci-aemif.h> +#include <linux/platform_data/spi-davinci.h> #include <media/tvp514x.h> #include <media/adv7343.h> |