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/fbmem.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 99bbd282ce63..a15b44e9c003 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -1513,7 +1513,6 @@ register_framebuffer(struct fb_info *fb_info) | |||
| 1513 | fb_info->fix.id, | 1513 | fb_info->fix.id, |
| 1514 | registered_fb[i]->fix.id); | 1514 | registered_fb[i]->fix.id); |
| 1515 | unregister_framebuffer(registered_fb[i]); | 1515 | unregister_framebuffer(registered_fb[i]); |
| 1516 | break; | ||
| 1517 | } | 1516 | } |
| 1518 | } | 1517 | } |
| 1519 | } | 1518 | } |