diff options
| author | Tom Rini <[email protected]> | 2018-06-23 21:47:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-06-23 21:47:39 -0400 |
| commit | 90efca253973944d7169932820e0bc6419b8cd7b (patch) | |
| tree | a7a80923c54aca218d30980a8ed8f607acf489a0 /common | |
| parent | 77b5ba5d2b94c5b028991c82782493f64bd4f392 (diff) | |
| parent | dd099ec44b5d0a5d2dff537fc5b3b3441a49eec6 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index 6b297068bd2..6949d4af0e3 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -596,7 +596,7 @@ static int initr_pcmcia(void) } #endif -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_BLK) static int initr_ide(void) { puts("IDE: "); @@ -826,7 +826,7 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) initr_pcmcia, #endif -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_BLK) initr_ide, #endif #ifdef CONFIG_LAST_STAGE_INIT |