From 81e29b2a9834e8133c7f6c50cdae92b27a94005e Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 18 Jan 2011 12:20:45 +0100
Subject: [PATCH] --- yaml --- r: 231883 b: refs/heads/master c:
 79aa18d557bef02171da42ee928c23509e6ef4f7 h: refs/heads/master i:   231881:
 6e271e2304063af1f96de9efd5081e7bba27c437   231879:
 a3546d6acd9efba7250505f662fd4e1f8ff5da71 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/mips/configs/malta_defconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f2222d59b9d..44787a0986fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e88b4e903dc6de7a82b76fd241e2ac6f87aa9e
+refs/heads/master: 79aa18d557bef02171da42ee928c23509e6ef4f7
diff --git a/trunk/arch/mips/configs/malta_defconfig b/trunk/arch/mips/configs/malta_defconfig
index b455d0f36486..9d03b68aece8 100644
--- a/trunk/arch/mips/configs/malta_defconfig
+++ b/trunk/arch/mips/configs/malta_defconfig
@@ -369,7 +369,10 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_HWMON is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
 # CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_HID=m
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGER_TIMER=m