Merge branch 'master' of git://git.denx.de/u-boot-nios

[oweals/u-boot.git] / include / configs / cm-bf548.h

diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index b08b770e31adc34a0b0116131f8d755f1ace55a2..b5cfc2199e2cfcd0650d305412d9bddc4fd1a536 100644 (file)
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -5,7 +5,7 @@
 #ifndef __CONFIG_CM_BF548_H__
 #define __CONFIG_CM_BF548_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
@@ -69,9 +69,10 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_DRIVER_SMC911X  1
-#define CONFIG_DRIVER_SMC911X_BASE     0x24000000
-#define CONFIG_DRIVER_SMC911X_16_BIT
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X 1
+#define CONFIG_SMC911X_BASE    0x24000000
+#define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                cm-bf548
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR      02:80:ad:24:31:91 */
@@ -136,6 +137,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
-
 #endif