diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /arch/arm/mach-omap2/drm.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
| download | olio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.xz olio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/drm.c')
| -rw-r--r-- | arch/arm/mach-omap2/drm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 72e0f01b715..6282cc82661 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -24,8 +24,8 @@ #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <plat/omap_device.h> -#include <plat/omap_hwmod.h> +#include "omap_device.h" +#include "omap_hwmod.h" #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) |