diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-09-09 16:16:20 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-09-09 16:16:20 -0500 |
| commit | 650a9e7abc44ce1ce73d6668eaf0ba2d6b8025e9 (patch) | |
| tree | 30732e12d39390eda22338e98db7b8ab9025bf22 /lib_i386/video_bios.c | |
| parent | 6cc64f9b5f69239c8b1969572b5a3a4aab7de5b9 (diff) | |
| parent | 3b20fd83c73c22acfcb0c6663be747bd5c8b7011 (diff) | |
| download | u-boot-650a9e7abc44ce1ce73d6668eaf0ba2d6b8025e9.tar.gz u-boot-650a9e7abc44ce1ce73d6668eaf0ba2d6b8025e9.tar.xz u-boot-650a9e7abc44ce1ce73d6668eaf0ba2d6b8025e9.zip | |
Merge branch 'denx'
Diffstat (limited to 'lib_i386/video_bios.c')
| -rw-r--r-- | lib_i386/video_bios.c | 3 |
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 |