@ -23,9 +23,7 @@
# include <dm.h>
# include <dm.h>
# include <environment.h>
# include <environment.h>
# include <fdtdec.h>
# include <fdtdec.h>
# if defined(CONFIG_CMD_IDE)
# include <ide.h>
# include <ide.h>
# endif
# include <initcall.h>
# include <initcall.h>
# include <init_helpers.h>
# include <init_helpers.h>
# ifdef CONFIG_PS2KBD
# ifdef CONFIG_PS2KBD
@ -611,7 +609,7 @@ static int initr_post(void)
}
}
# endif
# endif
# if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_ IDE)
# if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE)
static int initr_pcmcia ( void )
static int initr_pcmcia ( void )
{
{
puts ( " PCMCIA: " ) ;
puts ( " PCMCIA: " ) ;
@ -620,7 +618,7 @@ static int initr_pcmcia(void)
}
}
# endif
# endif
# if defined(CONFIG_CMD_ IDE)
# if defined(CONFIG_IDE)
static int initr_ide ( void )
static int initr_ide ( void )
{
{
# ifdef CONFIG_IDE_8xx_PCCARD
# ifdef CONFIG_IDE_8xx_PCCARD
@ -870,10 +868,10 @@ static init_fnc_t init_sequence_r[] = {
# ifdef CONFIG_POST
# ifdef CONFIG_POST
initr_post ,
initr_post ,
# endif
# endif
# if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_ IDE)
# if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE)
initr_pcmcia ,
initr_pcmcia ,
# endif
# endif
# if defined(CONFIG_CMD_ IDE)
# if defined(CONFIG_IDE)
initr_ide ,
initr_ide ,
# endif
# endif
# ifdef CONFIG_LAST_STAGE_INIT
# ifdef CONFIG_LAST_STAGE_INIT