diff --git a/arch/arm/configs/htcleo_defconfig b/arch/arm/configs/htcleo_defconfig
index 014a4b6f..4819d284 100644
--- a/arch/arm/configs/htcleo_defconfig
+++ b/arch/arm/configs/htcleo_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.15
-# Tue Sep  7 15:11:49 2010
+# Fri Sep 17 12:02:54 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -941,7 +941,6 @@ CONFIG_PPPOPNS=y
 CONFIG_SLHC=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_MSM_RMNET is not set
-# CONFIG_MSM_RMNET_DEBUG is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_KINETO_GAN is not set
@@ -1290,6 +1289,7 @@ CONFIG_GPU_MSM_KGSL=y
 CONFIG_MSM_KGSL_MMU=y
 # CONFIG_MSM_KGSL_PER_FD_PAGETABLE is not set
 # CONFIG_MSM_HDMI is not set
+CONFIG_FB_MSM_LOGO=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -1302,20 +1302,7 @@ CONFIG_MSM_KGSL_MMU=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
diff --git a/drivers/video/msm/Kconfig b/drivers/video/msm/Kconfig
index 25b20501..1ca3622c 100644
--- a/drivers/video/msm/Kconfig
+++ b/drivers/video/msm/Kconfig
@@ -76,3 +76,10 @@ config MSM_HDMI
 	depends on MSM_MDP31
 	default n
 
+config FB_MSM_LOGO
+       bool "Use boot splashscreen"
+       depends on FB_MSM
+       default y
+       help
+        Use logo.rle splash screen at startup
+
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 2284d1ff..525806ca 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -1086,12 +1086,12 @@ static int msmfb_probe(struct platform_device *pdev)
 #ifdef CONFIG_FB_MSM_LOGO
 	if (!load_565rle_image(INIT_IMAGE_FILE)) {
 		/* Flip buffer */
-		msmfb->update_info.left = 0;
+	        msmfb->update_info.left = 0;
 		msmfb->update_info.top = 0;
-		msmfb->update_info.eright = info->var.xres;
-		msmfb->update_info.ebottom = info->var.yres;
-		msmfb_pan_update(info, 0, 0, fb->var.xres,
-				 fb->var.yres, 0, 1);
+		msmfb->update_info.eright = msmfb->xres;
+	        msmfb->update_info.ebottom = msmfb->yres;
+		msmfb_pan_update(msmfb->fb, 0, 0, msmfb->xres,
+				 msmfb->yres, 0, 1);
 	}
 #endif
 	/* Jay, 29/12/08' */