diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:29:23 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:29:23 +0400 |
| commit | 88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3 (patch) | |
| tree | f79f728c308100bc3e57d0d2f5d1e00d90406a0d /drivers/gpu/drm/msm/mdp4/mdp4_kms.c | |
| parent | e18945b159a1cdbc031f1d3b0b7e515a33bdcbf7 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.tar.xz | |
Merge 3.12-rc3 into driver-core-next
We want the driver core and sysfs fixes in here to make merges and
development easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp4/mdp4_kms.c')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c index 5db5bbaedae2..bc7fd11ad8be 100644 --- a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c @@ -19,8 +19,6 @@ #include "msm_drv.h" #include "mdp4_kms.h" -#include <mach/iommu.h> - static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev); static int mdp4_hw_init(struct msm_kms *kms) |