Merge branch 'master' of ../work into next

[oweals/u-boot.git] / include / configs / inka4x0.h

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 5f06b0922c6c252714feef9b1c4ea4bbef73063f..14f7826705601d39a234f51e4c6da4bc40d7814b 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -42,7 +42,6 @@
 #define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
 #define CONFIG_MISC_INIT_F     1       /* Use misc_init_f()                    */
-#define CONFIG_MISC_INIT_R     1       /* Use misc_init_r()                    */
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported                  */
 
@@ -418,7 +417,6 @@ static inline void tws_data_config_output(unsigned output)
 #undef CONFIG_IDE_8xx_DIRECT           /* Direct IDE    not supported  */
 #undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
 
-#define        CONFIG_IDE_RESET                /* reset for ide supported      */
 #define CONFIG_IDE_PREINIT
 
 #define CONFIG_SYS_IDE_MAXBUS          1       /* max. 1 IDE bus               */