Prepare v2018.03-rc1

[u-boot] / board / davinci / ea20 / ea20.c

diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c
index c4444c7c7f549cd2cb1f24e8cc3619e3a0c24f00..2a187f1900a60c23bceca917d06047e8f01a14a5 100644 (file)
--- a/board/davinci/ea20/ea20.c
+++ b/board/davinci/ea20/ea20.c
@@ -18,8 +18,9 @@
 #include <i2c.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/emif_defs.h>
+#include <asm/ti-common/davinci_nand.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
@@ -203,9 +204,7 @@ int board_early_init_f(void)
        /* Set LCD_B_PWR low to power down LCD Backlight*/
        gpio_direction_output(102, 0);
 
-#ifndef CONFIG_USE_IRQ
        irq_init();
-#endif
 
        /*
         * NAND CS setup - cycle counts based on da850evm NAND timings in the