diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/video/msm/mdp.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/video/msm/mdp.c')
| -rw-r--r-- | drivers/video/msm/mdp.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, | |||
| 258 | { | 258 | { |
| 259 | int put_needed, ret = 0; | 259 | int put_needed, ret = 0; |
| 260 | struct file *file; | 260 | struct file *file; |
| 261 | unsigned long vstart; | ||
| 262 | 261 | ||
| 263 | file = fget_light(img->memory_id, &put_needed); | 262 | file = fget_light(img->memory_id, &put_needed); |
| 264 | if (file == NULL) | 263 | if (file == NULL) |