diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 (GMT) |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 (GMT) |
| commit | 94bd217e2d683719ab21a4ac117d8a1b91cbedc9 (patch) | |
| tree | f2d506818cc1643ca816f609518ab5d1cdb28e66 /drivers/video/fbsysfs.c | |
| parent | 5dd72f12df00cbabc16de770b79b17ced63138be (diff) | |
| parent | 93ee7a9340d64f20295aacc3fb6a22b759323280 (diff) | |
| download | linux-fsl-qoriq-94bd217e2d683719ab21a4ac117d8a1b91cbedc9.tar.xz | |
Merge commit 'v3.1-rc2' into HEAD
Diffstat (limited to 'drivers/video/fbsysfs.c')
| -rw-r--r-- | drivers/video/fbsysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index f4a3277..04251ce 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c @@ -33,7 +33,7 @@ * for driver private data (info->par). info->par (if any) will be * aligned to sizeof(long). * - * Returns the new structure, or NULL if an error occured. + * Returns the new structure, or NULL if an error occurred. * */ struct fb_info *framebuffer_alloc(size_t size, struct device *dev) |