diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-06 13:24:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:43 -0400 |
| commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
| tree | b1116470884e46c0a66c49525771cf9b49c3835d /lib | |
| parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
| parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
| download | u-boot-d77fa2ff766bbb4b867e791187f78b6033071613.zip u-boot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz u-boot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.bz2 | |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tizen/tizen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/tizen/tizen.c b/lib/tizen/tizen.c index 814ed18..d207f77 100644 --- a/lib/tizen/tizen.c +++ b/lib/tizen/tizen.c @@ -12,6 +12,7 @@ #include "tizen_logo_16bpp.h" #include "tizen_logo_16bpp_gzip.h" +#ifdef CONFIG_LCD void get_tizen_logo_info(vidinfo_t *vid) { switch (vid->vl_bpix) { @@ -31,3 +32,4 @@ void get_tizen_logo_info(vidinfo_t *vid) break; } } +#endif |