From: Wolfgang Denk <wd@denx.de>
Date: Sun, 19 Sep 2010 15:47:52 +0000 (+0200)
Subject: Prepare v2010.09-rc2
X-Git-Tag: v2010.09-rc2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=09012d353eaf26310dc3ddb1915a3d3504ab9a27;p=u-boot

Prepare v2010.09-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/Makefile b/Makefile
index 6ffbb5ab7e..c15897cf20 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 2010
 PATCHLEVEL = 09
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
diff --git a/arch/arm/cpu/pxa/pxafb.c b/arch/arm/cpu/pxa/pxafb.c
index 524a03b62e..0ee6a75319 100644
--- a/arch/arm/cpu/pxa/pxafb.c
+++ b/arch/arm/cpu/pxa/pxafb.c
@@ -183,7 +183,7 @@ vidinfo_t panel_info = {
 #ifdef CONFIG_LMS283GF05
 
 # define LCD_BPP	LCD_COLOR8
-//# define LCD_INVERT_COLORS
+/*# define LCD_INVERT_COLORS*/
 
 /* you have to set lccr0 and lccr3 (including pcd) */
 # define REG_LCCR0	0x043008f8