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

drivers/net/Makefile

@@ -55,6 +55,7 @@ COBJS-y += rtl8139.o
 COBJS-y += rtl8169.o
 COBJS-y += s3c4510b_eth.o
 COBJS-y += smc91111.o
+COBJS-y += smc911x.o
 COBJS-y += tigon3.o
 COBJS-y += tsec.o
 COBJS-y += tsi108_eth.o

include/configs/imx31_litekit.h

@@ -92,6 +92,7 @@
 
 #define CONFIG_DRIVER_SMC911X		1
 #define CONFIG_DRIVER_SMC911X_BASE	0xb4020000
+#define CONFIG_DRIVER_SMC911X_32_BIT	1
 
 /*
  * Miscellaneous configurable options

include/configs/imx31_phycore.h

@@ -108,6 +108,7 @@
 
 #define CONFIG_DRIVER_SMC911X		1
 #define CONFIG_DRIVER_SMC911X_BASE	0xa8000000
+#define CONFIG_DRIVER_SMC911X_32_BIT	1
 
 /*
  * Miscellaneous configurable options