summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-19 17:47:52 +0200
committerWolfgang Denk <wd@denx.de>2010-09-19 17:47:52 +0200
commit07517e7f4f582d1607adbc444bab75af3ac4a7f9 (patch)
tree37f046f1ad06998aadc1774094fad5755e48d160
parenta80603598cef13ab8031b514a603ef1a6169d249 (diff)
Prepare v2010.09-rc2v2010.09-rc2
Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--Makefile2
-rw-r--r--arch/arm/cpu/pxa/pxafb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6ffbb5ab7e7..c15897cf201 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 524a03b62ef..0ee6a75319c 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