diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/w100fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/w100fb.c')
| -rw-r--r-- | drivers/video/w100fb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 2376f688ec8b..31b0e17ed090 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| @@ -628,7 +629,7 @@ static int w100fb_resume(struct platform_device *dev) | |||
| 628 | #endif | 629 | #endif |
| 629 | 630 | ||
| 630 | 631 | ||
| 631 | int __init w100fb_probe(struct platform_device *pdev) | 632 | int __devinit w100fb_probe(struct platform_device *pdev) |
| 632 | { | 633 | { |
| 633 | int err = -EIO; | 634 | int err = -EIO; |
| 634 | struct w100fb_mach_info *inf; | 635 | struct w100fb_mach_info *inf; |