fix FB_GBE_MEM Kconfig to not break SGI O2, fwd from akpm

diff --git a/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch b/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch
new file mode 100644 (file)
index 0000000..eb56c0a
--- /dev/null
+++ b/queue/gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch
@@ -0,0 +1,36 @@
+From stable-bounces@linux.kernel.org  Fri Feb 24 13:09:10 2006
+Date: Fri, 24 Feb 2006 13:04:16 -0800
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: adaplas@pol.net, tbm@cyrius.com, stable@kernel.org
+Subject: [PATCH] gbefb: Set default of FB_GBE_MEM to 4 MB
+
+
+From: Martin Michlmayr <tbm@cyrius.com>
+
+Allocating more than 4 MB memory for the GBE (SGI O2) framebuffer completely
+breakfs gbefb support at the moment.  According to comments on #mipslinux,
+more than 4 MB has never worked correctly in Linux.  Therefore, the default
+should be 4 MB.
+
+Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
+Signed-off-by: Antonino Daplas <adaplas@pol.net>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/video/Kconfig |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.4.orig/drivers/video/Kconfig
++++ linux-2.6.15.4/drivers/video/Kconfig
+@@ -520,7 +520,7 @@ config FB_GBE
+ config FB_GBE_MEM
+       int "Video memory size in MB"
+       depends on FB_GBE
+-      default 8
++      default 4
+       help
+         This is the amount of memory reserved for the framebuffer,
+         which can be any value between 1MB and 8MB.

diff --git a/queue/series b/queue/series
index c797575de69fa65cbba9a12cb51b9dafde62834b..95321ba9fad90e98d32c80d322f782fbd2a5c9f7 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -21,3 +21,4 @@ hwmon-it87-probe-i2c-0x2d-only.patch
 fix-snd-usb-audio-in-32-bit-compat-environment.patch
 alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch
 cfi-init-wait-queue-in-chip-struct.patch
+gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch