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-exynos/mach-origen.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-exynos/mach-origen.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index a54ce4ef7057..0b8d24e27e74 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
| @@ -35,8 +35,8 @@ | |||
| 35 | #include <plat/cpu.h> | 35 | #include <plat/cpu.h> |
| 36 | #include <plat/devs.h> | 36 | #include <plat/devs.h> |
| 37 | #include <plat/sdhci.h> | 37 | #include <plat/sdhci.h> |
| 38 | #include <plat/iic.h> | 38 | #include <linux/platform_data/i2c-s3c2410.h> |
| 39 | #include <plat/ehci.h> | 39 | #include <linux/platform_data/usb-ehci-s5p.h> |
| 40 | #include <plat/clock.h> | 40 | #include <plat/clock.h> |
| 41 | #include <plat/gpio-cfg.h> | 41 | #include <plat/gpio-cfg.h> |
| 42 | #include <plat/backlight.h> | 42 | #include <plat/backlight.h> |
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <plat/mfc.h> | 44 | #include <plat/mfc.h> |
| 45 | #include <plat/hdmi.h> | 45 | #include <plat/hdmi.h> |
| 46 | 46 | ||
| 47 | #include <mach/ohci.h> | 47 | #include <linux/platform_data/usb-exynos.h> |
| 48 | #include <mach/map.h> | 48 | #include <mach/map.h> |
| 49 | 49 | ||
| 50 | #include <drm/exynos_drm.h> | 50 | #include <drm/exynos_drm.h> |