diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-08 01:58:20 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-08 01:58:20 +0400 |
| commit | 5d25da8a3faacca4c13df91f2ae1de4b94190a90 (patch) | |
| tree | 48bba643a02286ebb504e9335ebfba92b2bc9f06 | |
| parent | 10dff7f4286699d79a19e581c88e04ced9a576a0 (diff) | |
| parent | 4dc7ae209cbf38939639378ec96752f3b668241b (diff) | |
Merge branch 'tracking-ll-v3.8-misc-fixes' into merge-linux-linaroll-20130208.0
| -rw-r--r-- | arch/arm/mach-omap2/drm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index d53169bf46a3..2a2cfa88ddbf 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -28,7 +28,6 @@ #include "soc.h" #include "omap_device.h" #include "omap_hwmod.h" -#include "soc.h" #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) |