projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
common
/
lcd.c
diff --git
a/common/lcd.c
b/common/lcd.c
index
783626e
..
2405146
100644
(file)
--- a/
common/lcd.c
+++ b/
common/lcd.c
@@
-704,7
+704,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
}
break;
#endif /* CONFIG_BMP_16BPP */
}
break;
#endif /* CONFIG_BMP_16BPP */
-#if defined(CONFIG_BMP_24B
M
P)
+#if defined(CONFIG_BMP_24B
P
P)
case 24:
for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) {
case 24:
for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) {
@@
-716,7
+716,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
fb -= lcd_line_length + width * (bpix / 8);
}
break;
fb -= lcd_line_length + width * (bpix / 8);
}
break;
-#endif /* CONFIG_BMP_24B
M
P */
+#endif /* CONFIG_BMP_24B
P
P */
#if defined(CONFIG_BMP_32BPP)
case 32:
for (i = 0; i < height; ++i) {
#if defined(CONFIG_BMP_32BPP)
case 32:
for (i = 0; i < height; ++i) {