diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/video/fbsysfs.c | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 f4a32779168b..04251ce89184 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * for driver private data (info->par). info->par (if any) will be | 33 | * for driver private data (info->par). info->par (if any) will be |
34 | * aligned to sizeof(long). | 34 | * aligned to sizeof(long). |
35 | * | 35 | * |
36 | * Returns the new structure, or NULL if an error occured. | 36 | * Returns the new structure, or NULL if an error occurred. |
37 | * | 37 | * |
38 | */ | 38 | */ |
39 | struct fb_info *framebuffer_alloc(size_t size, struct device *dev) | 39 | struct fb_info *framebuffer_alloc(size_t size, struct device *dev) |