Merge branch 'u-boot/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / include / configs / silk.h

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 161e0a5..b105f5a 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -44,13 +44,11 @@
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_QUAD
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1