aboutsummaryrefslogtreecommitdiff
path: root/board/esd
diff options
context:
space:
mode:
authorStefan Roese2005-09-30 16:41:12 +0200
committerStefan Roese2005-09-30 16:41:12 +0200
commit2c7b2ab5a072a2aa0b2c3e8c48b3302f5122f11e (patch)
tree95b82820b9af8ab3f16a02a598e34d7c316cdaa8 /board/esd
parent709d8ec0d8a99cc745dde3b87c7c65d410305bf2 (diff)
Fix problem with SM501 init on HH405 board.
Patch by Stefan Roese, 30 Sep 2005
Diffstat (limited to 'board/esd')
-rw-r--r--board/esd/hh405/hh405.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index 67a0c30e2c7..5c0d070a7f6 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -367,7 +367,6 @@ int misc_init_r (void)
int i;
char *str;
unsigned long contrast0 = 0xffffffff;
- pci_dev_t devbusfn;
dst = malloc(CFG_FPGA_MAX_SIZE);
if (gunzip (dst, CFG_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) != 0) {
@@ -554,7 +553,10 @@ int misc_init_r (void)
regs_13704_320_240_4bpp,
sizeof(regs_13704_320_240_4bpp)/sizeof(regs_13704_320_240_4bpp[0]),
logo_bmp_320, sizeof(logo_bmp_320));
+#ifdef CONFIG_VIDEO_SM501
} else {
+ pci_dev_t devbusfn;
+
/*
* Is SM501 connected (ppc221/ppc231)?
*/
@@ -573,6 +575,7 @@ int misc_init_r (void)
printf("Unsupported bd_type defined (%s) -> No display configured!\n", str);
return 0;
}
+#endif /* CONFIG_VIDEO_SM501 */
}
return (0);