Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  video: msm: Fix section mismatch in mddi.c.
  drivers: video: msm: drop some unused variables

2 files changed, 1 insertions, 4 deletions

diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index c1ff271017a9..7c316c34dfca 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -187,10 +187,8 @@ static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);
 
 static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
 {
-        union mddi_rev *rev = mddi->rev_data;
         uint32_t rev_data_count;
         uint32_t rev_crc_err_count;
-        int i;
         struct reg_read_info *ri;
         size_t prev_offset;
         uint16_t length;
@@ -670,7 +668,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)
         return 0;
 }
 
-static int __init mddi_probe(struct platform_device *pdev)
+static int __devinit mddi_probe(struct platform_device *pdev)
 {
         struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
         struct mddi_info *mddi = &mddi_info[pdev->id];
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 19c01c6208e8..3c28db03ad39 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -258,7 +258,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
 {
         int put_needed, ret = 0;
         struct file *file;
-        unsigned long vstart;
 
         file = fget_light(img->memory_id, &put_needed);
         if (file == NULL)