diff options
| author | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
| commit | 68e80fdda1336068f40915388bbdacfd2b75233a (patch) | |
| tree | deb28e65fdd601e47bf5564f67da3035a840e284 /common/board_r.c | |
| parent | 35d4fed320d577a4446531d7b9350ce40065c4b0 (diff) | |
| parent | 8a9cd5ad6f89ab721a352cbb9264bea5ede68789 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index 7e1a76d97f7..3affb6362f4 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -354,7 +354,7 @@ static int initr_flash(void) } #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) static int initr_spi(void) { /* PPC does this here */ |