diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:06:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:06:27 +0100 |
| commit | 1fd317076caf1ee22ddb6a7853a0ca462f0233c5 (patch) | |
| tree | 09f657809faf866bb11c43d831b3bd45589e486d /drivers | |
| parent | ca15f790e049f40951dc0d688084dd670df445a5 (diff) | |
| parent | ffb287c9daabc3734a92def0d59796f065ad29eb (diff) | |
| download | op-kernel-dev-1fd317076caf1ee22ddb6a7853a0ca462f0233c5.zip op-kernel-dev-1fd317076caf1ee22ddb6a7853a0ca462f0233c5.tar.gz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/pxa168fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c index c91a7f7..5d786bd 100644 --- a/drivers/video/pxa168fb.c +++ b/drivers/video/pxa168fb.c @@ -559,7 +559,7 @@ static struct fb_ops pxa168fb_ops = { .fb_imageblit = cfb_imageblit, }; -static int __init pxa168fb_init_mode(struct fb_info *info, +static int __devinit pxa168fb_init_mode(struct fb_info *info, struct pxa168fb_mach_info *mi) { struct pxa168fb_info *fbi = info->par; @@ -599,7 +599,7 @@ static int __init pxa168fb_init_mode(struct fb_info *info, return ret; } -static int __init pxa168fb_probe(struct platform_device *pdev) +static int __devinit pxa168fb_probe(struct platform_device *pdev) { struct pxa168fb_mach_info *mi; struct fb_info *info = 0; @@ -792,7 +792,7 @@ static struct platform_driver pxa168fb_driver = { .probe = pxa168fb_probe, }; -static int __devinit pxa168fb_init(void) +static int __init pxa168fb_init(void) { return platform_driver_register(&pxa168fb_driver); } |
