diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-30 14:08:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-30 19:31:17 -0500 |
| commit | a2cb31086f68cc0db95d4373e6dbdb612954f445 (patch) | |
| tree | 0da2e0ac66e184ba536d525f5007d88cea6f0372 /common | |
| parent | bb417f1c9055dc17df08d1e2c9edc281ad19b648 (diff) | |
| parent | 6fd596a1aa57bd431263f45b0c57ee8ae6b2403c (diff) | |
| download | u-boot-a2cb31086f68cc0db95d4373e6dbdb612954f445.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
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 d959ad3c6f..5496f45cbd 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -191,7 +191,7 @@ static int initr_serial(void) return 0; } -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) static int initr_trap(void) { /* @@ -807,7 +807,7 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_NEEDS_MANUAL_RELOC initr_manual_reloc_cmdtable, #endif -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) initr_trap, #endif #ifdef CONFIG_ADDR_MAP |