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/metronomefb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/metronomefb.c')
| -rw-r--r-- | drivers/video/metronomefb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c index df1f757a6161..9b3d6e4584cc 100644 --- a/drivers/video/metronomefb.c +++ b/drivers/video/metronomefb.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| @@ -700,7 +699,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev) | |||
| 700 | if (retval < 0) | 699 | if (retval < 0) |
| 701 | goto err_free_irq; | 700 | goto err_free_irq; |
| 702 | 701 | ||
| 703 | info->flags = FBINFO_FLAG_DEFAULT; | 702 | info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB; |
| 704 | 703 | ||
| 705 | info->fbdefio = &metronomefb_defio; | 704 | info->fbdefio = &metronomefb_defio; |
| 706 | fb_deferred_io_init(info); | 705 | fb_deferred_io_init(info); |