diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /drivers/video/fbsysfs.c | |
| parent | 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff) | |
| parent | dc53fffc105f68cb08ca872acd51550e89aa2e67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'drivers/video/fbsysfs.c')
| -rw-r--r-- | drivers/video/fbsysfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index d4a2c11d9809..afc04df39a03 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -62,6 +62,9 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev) | |||
| 62 | mutex_init(&info->bl_curve_mutex); | 62 | mutex_init(&info->bl_curve_mutex); |
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | mutex_init(&info->lock); | ||
| 66 | mutex_init(&info->mm_lock); | ||
| 67 | |||
| 65 | return info; | 68 | return info; |
| 66 | #undef PADDING | 69 | #undef PADDING |
| 67 | #undef BYTES_PER_LONG | 70 | #undef BYTES_PER_LONG |