summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-06 23:45:35 +0100
committerWolfgang Denk <wd@denx.de>2010-12-06 23:45:35 +0100
commitf12af1f38dc59a6dfe0fed1359e1a05e700a435b (patch)
tree2d019236794576f403496d03511c81454921c743 /include
parentf61f59da0fdcec37046680de3972709fe65282ac (diff)
parentf550c521e123f2c35d742599f19f4aea2db85951 (diff)
downloadu-boot-imx-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.zip
u-boot-imx-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.tar.gz
u-boot-imx-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
-rw-r--r--include/configs/aria.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/aria.h b/include/configs/aria.h
index b3ca8d2..3a60de0 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -49,7 +49,6 @@
#define CONFIG_E300 1 /* E300 Family */
#define CONFIG_MPC512X 1 /* MPC512X family */
#define CONFIG_FSL_DIU_FB 1 /* FSL DIU */
-#define CONFIG_FSL_DIU_LOGO_BMP 1 /* Don't include FSL DIU binary bmp */
#define CONFIG_SYS_TEXT_BASE 0xFFF00000