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/vga16fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/vga16fb.c')
| -rw-r--r-- | drivers/video/vga16fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c index 5b2938903ac2..bf638a47a5b3 100644 --- a/drivers/video/vga16fb.c +++ b/drivers/video/vga16fb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 21 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| @@ -1293,7 +1292,7 @@ static int vga16fb_setup(char *options) | |||
| 1293 | } | 1292 | } |
| 1294 | #endif | 1293 | #endif |
| 1295 | 1294 | ||
| 1296 | static int __init vga16fb_probe(struct platform_device *dev) | 1295 | static int __devinit vga16fb_probe(struct platform_device *dev) |
| 1297 | { | 1296 | { |
| 1298 | struct fb_info *info; | 1297 | struct fb_info *info; |
| 1299 | struct vga16fb_par *par; | 1298 | struct vga16fb_par *par; |