diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 16:41:57 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 16:41:57 +0900 |
commit | d28c145debb1bd53cde63ac8bccc192e3e00067e (patch) | |
tree | 87fb1d66cab7689aa662ebd0337b39ff1bf6f433 /drivers/video/vfb.c | |
parent | 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 (diff) | |
parent | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff) | |
download | op-kernel-dev-d28c145debb1bd53cde63ac8bccc192e3e00067e.zip op-kernel-dev-d28c145debb1bd53cde63ac8bccc192e3e00067e.tar.gz |
Merge branch 'sh/driver-core' into sh/clkfwk
Diffstat (limited to 'drivers/video/vfb.c')
-rw-r--r-- | drivers/video/vfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index 050d432..b8ab995 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c @@ -479,7 +479,7 @@ static int __init vfb_setup(char *options) * Initialisation */ -static int __init vfb_probe(struct platform_device *dev) +static int __devinit vfb_probe(struct platform_device *dev) { struct fb_info *info; int retval = -ENOMEM; |