summaryrefslogtreecommitdiff
path: root/arch/x86/lib/board.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-03-20 14:55:10 -0400
committerTom Rini <trini@ti.com>2013-03-20 14:55:10 -0400
commit8b906a9f0b3fd0d4421e08c4fa62f61a01289611 (patch)
tree049acc34fee9692c0c394b8d1697d97257c0a074 /arch/x86/lib/board.c
parent3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff)
parent1e7133e99e27c4f02998e7eb87fa43424d48152b (diff)
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/board.c')
-rw-r--r--arch/x86/lib/board.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 452e5d8262..f372898f61 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -164,13 +164,13 @@ init_fnc_t *init_sequence_r[] = {
#ifndef CONFIG_SYS_NO_FLASH
flash_init_r,
#endif
-#ifdef CONFIG_SPI
- init_func_spi;
-#endif
- env_relocate_r,
#ifdef CONFIG_PCI
pci_init_r,
#endif
+#ifdef CONFIG_SPI
+ init_func_spi,
+#endif
+ env_relocate_r,
stdio_init,
jumptable_init_r,
console_init_r,