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/epson1355fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/epson1355fb.c')
| -rw-r--r-- | drivers/video/epson1355fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index 2735b79e52a1..db9713b49ce9 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 49 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 50 | #include <linux/mm.h> | 50 | #include <linux/mm.h> |
| 51 | #include <linux/slab.h> | ||
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 53 | #include <linux/fb.h> | 52 | #include <linux/fb.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| @@ -602,7 +601,7 @@ static int epson1355fb_remove(struct platform_device *dev) | |||
| 602 | return 0; | 601 | return 0; |
| 603 | } | 602 | } |
| 604 | 603 | ||
| 605 | int __init epson1355fb_probe(struct platform_device *dev) | 604 | int __devinit epson1355fb_probe(struct platform_device *dev) |
| 606 | { | 605 | { |
| 607 | struct epson1355_par *default_par; | 606 | struct epson1355_par *default_par; |
| 608 | struct fb_info *info; | 607 | struct fb_info *info; |