Merge branch 'Makefile' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / common / cyclon2.c

diff --git a/common/cyclon2.c b/common/cyclon2.c
index 06f5e8aeaec5477ea6b8d191e23f2ef8538a5855..479bebbe427dca063195ad007eb8b54f4ec907df 100644 (file)
--- a/common/cyclon2.c
+++ b/common/cyclon2.c
@@ -27,8 +27,6 @@
 #include <altera.h>
 #include <ACEX1K.h>            /* ACEX device family */
 
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ALTERA) && defined(CONFIG_FPGA_CYCLON2)
-
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef FPGA_DEBUG
 #define PRINTF(fmt,args...)    printf (fmt ,##args)
@@ -301,5 +299,3 @@ static int CYC2_ps_reloc (Altera_desc * desc, ulong reloc_offset)
 
        return ret_val;
 }
-
-#endif /* CONFIG_FPGA && CONFIG_FPGA_ALTERA && CONFIG_FPGA_CYCLON2 */