From 7b4c1ada7d63a8169c1a325d221e3e4483855d57 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@ppcg5.localdomain>
Date: Sun, 6 Dec 2009 20:01:26 +0000
Subject: [PATCH] --- yaml --- r: 175817 b: refs/heads/master c:
 ceae8cbe94f3127253110e2d01b9334069e93177 h: refs/heads/master i:   175815:
 3d9076881f3cfb9334a121f24bfceefe14452ff7 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/video/offb.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0cb84e0a70c2..2f73579233cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88358ab08944da726e948d216977ad499dfc15c6
+refs/heads/master: ceae8cbe94f3127253110e2d01b9334069e93177
diff --git a/trunk/drivers/video/offb.c b/trunk/drivers/video/offb.c
index 4d8c54c23dd7..b043ac83c412 100644
--- a/trunk/drivers/video/offb.c
+++ b/trunk/drivers/video/offb.c
@@ -282,8 +282,17 @@ static int offb_set_par(struct fb_info *info)
 	return 0;
 }
 
+static void offb_destroy(struct fb_info *info)
+{
+	if (info->screen_base)
+		iounmap(info->screen_base);
+	release_mem_region(info->aperture_base, info->aperture_size);
+	framebuffer_release(info);
+}
+
 static struct fb_ops offb_ops = {
 	.owner		= THIS_MODULE,
+	.fb_destroy	= offb_destroy,
 	.fb_setcolreg	= offb_setcolreg,
 	.fb_set_par	= offb_set_par,
 	.fb_blank	= offb_blank,
@@ -482,10 +491,14 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 	var->sync = 0;
 	var->vmode = FB_VMODE_NONINTERLACED;
 
+	/* set offb aperture size for generic probing */
+	info->aperture_base = address;
+	info->aperture_size = fix->smem_len;
+
 	info->fbops = &offb_ops;
 	info->screen_base = ioremap(address, fix->smem_len);
 	info->pseudo_palette = (void *) (info + 1);
-	info->flags = FBINFO_DEFAULT | foreign_endian;
+	info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
 
 	fb_alloc_cmap(&info->cmap, 256, 0);