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/q40fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/q40fb.c')
| -rw-r--r-- | drivers/video/q40fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c index 4beac1df617b..fc32c323a381 100644 --- a/drivers/video/q40fb.c +++ b/drivers/video/q40fb.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 20 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| @@ -85,7 +84,7 @@ static struct fb_ops q40fb_ops = { | |||
| 85 | .fb_imageblit = cfb_imageblit, | 84 | .fb_imageblit = cfb_imageblit, |
| 86 | }; | 85 | }; |
| 87 | 86 | ||
| 88 | static int __init q40fb_probe(struct platform_device *dev) | 87 | static int __devinit q40fb_probe(struct platform_device *dev) |
| 89 | { | 88 | { |
| 90 | struct fb_info *info; | 89 | struct fb_info *info; |
| 91 | 90 | ||