diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
| commit | 3b93020d74630f0574cbd26d200a82c00dd11eaa (patch) | |
| tree | fdf53ce4da01d337ceb71cadf496a9fc8d2fb62c /common/ACEX1K.c | |
| parent | c83d7ca4dadd44ae430235077f63b64a11f36f6e (diff) | |
| parent | 6007f3251c0967adc13f2ed8be1b924ddc30124d (diff) | |
| download | u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.zip u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.gz u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'common/ACEX1K.c')
| -rw-r--r-- | common/ACEX1K.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/ACEX1K.c b/common/ACEX1K.c index 2a421e2..76dc166 100644 --- a/common/ACEX1K.c +++ b/common/ACEX1K.c @@ -28,7 +28,7 @@ #include <common.h> /* core U-Boot definitions */ #include <ACEX1K.h> /* ACEX device family */ -#if (CONFIG_FPGA & (CFG_ALTERA | CFG_ACEX1K)) +#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_ACEX1K) /* Define FPGA_DEBUG to get debug printf's */ #ifdef FPGA_DEBUG @@ -363,4 +363,4 @@ static int ACEX1K_ps_reloc (Altera_desc * desc, ulong reloc_offset) } -#endif /* (CONFIG_FPGA & (CFG_ALTERA | CFG_ACEX1K)) */ +#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_ACEX1K */ |