diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-13 15:12:02 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-13 15:12:20 -0700 |
| commit | bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5 (patch) | |
| tree | 1ca5384ec71f31bd9ae04d867952ca2ced00fe11 /drivers/video | |
| parent | 311b79bb7e253dc5916db6dc14374dae0cd4ff9c (diff) | |
| parent | 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1 (diff) | |
| download | op-kernel-dev-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.zip op-kernel-dev-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.tar.gz | |
Merge branch 'msm/cleanup' into next/cleanup
From David Brown <davidb@codeaurora.org>:
* msm/cleanup:
ARM: msm: Only compile io.c on platforms that use it
iommu/msm: Move mach includes to iommu directory
ARM: msm: Remove devices-iommu.c
ARM: msm: Move mach/board.h contents to common.h
ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
ARM: msm: Remove TMR and TMR0 static mappings
ARM: msm: Move debug-macro.S to include/debug
ARM: msm: Don't compile __msm_ioremap_caller() unless used
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/msm/msm_fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index ec08a9e..1374803 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c @@ -26,7 +26,6 @@ #include <linux/io.h> #include <linux/uaccess.h> #include <linux/platform_data/video-msm_fb.h> -#include <mach/board.h> #include <linux/workqueue.h> #include <linux/clk.h> #include <linux/debugfs.h> |
