diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
index 8df77cfa0fae..dcf596facfc3 100644
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Tue Jun 14 19:44:52 2011
+# Thu Jun 16 18:40:20 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -52,11 +52,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-# CONFIG_USER_SCHED is not set
-CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
 # CONFIG_CGROUP_NS is not set
@@ -66,6 +61,9 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
@@ -598,7 +596,6 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND is not set
 CONFIG_MTD_RKNAND=y
 CONFIG_MTD_NAND_RK29XX=y
-CONFIG_RKFTL_PAGECACHE_SIZE=64
 CONFIG_MTD_RKNAND_BUFFER=y
 # CONFIG_MTD_NAND_RK29XX_DEBUG is not set
 # CONFIG_MTD_ONENAND is not set
@@ -1290,7 +1287,7 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_A22_CLUT224=y
+CONFIG_LOGO_CHARGER_CLUT224=y
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y
diff --git a/drivers/power/wm831x_charger_display.c b/drivers/power/wm831x_charger_display.c
index f6a0ff932938..ad0cc3c8c96c 100755
--- a/drivers/power/wm831x_charger_display.c
+++ b/drivers/power/wm831x_charger_display.c
@@ -73,23 +73,23 @@ extern void kernel_restart_prepare(char *cmd);
 extern int dwc_vbus_status( void );
 extern int dwc_otg_pcd_check_vbus_detech( unsigned long pdata );
 
-#if defined(CONFIG_LOGO_A22_CLUT224)
-extern struct linux_logo logo_a22_charger01_clut224;
-extern struct linux_logo logo_a22_charger02_clut224;
-extern struct linux_logo logo_a22_charger03_clut224;
-extern struct linux_logo logo_a22_charger04_clut224;
-extern struct linux_logo logo_a22_charger05_clut224;
-extern struct linux_logo logo_a22_charger06_clut224;
-extern struct linux_logo logo_a22_charger07_clut224;
-extern struct linux_logo logo_a22_charger08_clut224;
+#if defined(CONFIG_LOGO_CHARGER_CLUT224)
+extern struct linux_logo logo_charger01_clut224;
+extern struct linux_logo logo_charger02_clut224;
+extern struct linux_logo logo_charger03_clut224;
+extern struct linux_logo logo_charger04_clut224;
+extern struct linux_logo logo_charger05_clut224;
+extern struct linux_logo logo_charger06_clut224;
+extern struct linux_logo logo_charger07_clut224;
+extern struct linux_logo logo_charger08_clut224;
 #endif
 
 extern struct fb_info *g_fb0_inf;
 
 static struct linux_logo* g_chargerlogo[8]= {
-#if defined(CONFIG_LOGO_A22_CLUT224)
-	&logo_a22_charger01_clut224,&logo_a22_charger02_clut224,&logo_a22_charger03_clut224,&logo_a22_charger04_clut224,
-		&logo_a22_charger05_clut224,&logo_a22_charger06_clut224,&logo_a22_charger07_clut224,&logo_a22_charger08_clut224
+#if defined(CONFIG_LOGO_CHARGER_CLUT224)
+	&logo_charger01_clut224,&logo_charger02_clut224,&logo_charger03_clut224,&logo_charger04_clut224,
+		&logo_charger05_clut224,&logo_charger06_clut224,&logo_charger07_clut224,&logo_charger08_clut224
 #endif
 };
 
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
old mode 100644
new mode 100755
index 88aebda60896..065cdc3fd1da
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -82,8 +82,8 @@ config LOGO_M32R_CLUT224
 	depends on M32R
 	default y
 
-config LOGO_A22_CLUT224
-        bool "standard 224-color linux logo for rk2918 A22"
+config LOGO_CHARGER_CLUT224
+        bool "standard 224-color linux logo for rk2918 phone"
         default n
 
 
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
old mode 100644
new mode 100755
index 8a3ea2aabbc3..80e459c22043
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
 obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
 obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
 
-obj-$(CONFIG_LOGO_A22_CLUT224)         += logo_a22_charger00_clut224.o logo_a22_charger01_clut224.o logo_a22_charger02_clut224.o logo_a22_charger03_clut224.o logo_a22_charger04_clut224.o logo_a22_charger05_clut224.o logo_a22_charger06_clut224.o logo_a22_charger07_clut224.o logo_a22_charger08_clut224.o 
+obj-$(CONFIG_LOGO_CHARGER_CLUT224)         += logo_charger00_clut224.o logo_charger01_clut224.o logo_charger02_clut224.o logo_charger03_clut224.o logo_charger04_clut224.o logo_charger05_clut224.o logo_charger06_clut224.o logo_charger07_clut224.o logo_charger08_clut224.o 
 
 obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
 
diff --git a/drivers/video/logo/logo_a22_charger00_clut224.ppm b/drivers/video/logo/logo_charger00_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger00_clut224.ppm
rename to drivers/video/logo/logo_charger00_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger01_clut224.ppm b/drivers/video/logo/logo_charger01_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger01_clut224.ppm
rename to drivers/video/logo/logo_charger01_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger02_clut224.ppm b/drivers/video/logo/logo_charger02_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger02_clut224.ppm
rename to drivers/video/logo/logo_charger02_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger03_clut224.ppm b/drivers/video/logo/logo_charger03_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger03_clut224.ppm
rename to drivers/video/logo/logo_charger03_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger04_clut224.ppm b/drivers/video/logo/logo_charger04_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger04_clut224.ppm
rename to drivers/video/logo/logo_charger04_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger05_clut224.ppm b/drivers/video/logo/logo_charger05_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger05_clut224.ppm
rename to drivers/video/logo/logo_charger05_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger06_clut224.ppm b/drivers/video/logo/logo_charger06_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger06_clut224.ppm
rename to drivers/video/logo/logo_charger06_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger07_clut224.ppm b/drivers/video/logo/logo_charger07_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger07_clut224.ppm
rename to drivers/video/logo/logo_charger07_clut224.ppm
diff --git a/drivers/video/logo/logo_a22_charger08_clut224.ppm b/drivers/video/logo/logo_charger08_clut224.ppm
similarity index 100%
rename from drivers/video/logo/logo_a22_charger08_clut224.ppm
rename to drivers/video/logo/logo_charger08_clut224.ppm