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/hecubafb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/hecubafb.c')
| -rw-r--r-- | drivers/video/hecubafb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c index 0b4bffbe67c8..c77bcc6ab463 100644 --- a/drivers/video/hecubafb.c +++ b/drivers/video/hecubafb.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| @@ -253,7 +252,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev) | |||
| 253 | par->send_command = apollo_send_command; | 252 | par->send_command = apollo_send_command; |
| 254 | par->send_data = apollo_send_data; | 253 | par->send_data = apollo_send_data; |
| 255 | 254 | ||
| 256 | info->flags = FBINFO_FLAG_DEFAULT; | 255 | info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB; |
| 257 | 256 | ||
| 258 | info->fbdefio = &hecubafb_defio; | 257 | info->fbdefio = &hecubafb_defio; |
| 259 | fb_deferred_io_init(info); | 258 | fb_deferred_io_init(info); |