summaryrefslogtreecommitdiffstats
path: root/lib_i386/video_bios.c
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2008-09-07 07:08:42 +1000
committerWolfgang Denk <wd@denx.de>2008-09-09 11:48:53 +0200
commit3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd (patch)
treeb40a0685df1836f251fab53f4a767bb7287e0d03 /lib_i386/video_bios.c
parent5608692104efa8d56df803dc79ea41ac3607eee5 (diff)
downloadblackbird-obmc-uboot-3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd.tar.gz
blackbird-obmc-uboot-3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd.zip
Update i386 code (sc520_cdp)
Attempt to bring i386 / sc520 inline with master Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'lib_i386/video_bios.c')
-rw-r--r--lib_i386/video_bios.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib_i386/video_bios.c b/lib_i386/video_bios.c
index 45f78e22fa..ce96a3e058 100644
--- a/lib_i386/video_bios.c
+++ b/lib_i386/video_bios.c
@@ -136,6 +136,8 @@ static u32 probe_pci_video(void)
#endif
+#ifdef CONFIG_VIDEO
+
static int probe_isa_video(void)
{
u32 ptr;
@@ -217,3 +219,4 @@ int video_bios_init(void)
return 1;
}
+#endif
OpenPOWER on IntegriCloud