Merge branch 'master' of /home/wd/git/u-boot/custodians

Conflicts:

	include/configs/socrates.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc include/configs/socrates.h
index 00c0dabd61be371b69bba4676b97172a7db0892d,c3ecd6f403493211fa9fc41fdd0a6aa347b54943..23ed87f33828bc0d6fd423eb50c9a5059c80cc4a
--- 1/include/configs/socrates.h
--- 2/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@@ -236,8 -226,15 +236,14 @@@
  #define CFG_PCI1_IO_SIZE      0x01000000      /* 16M                  */
  
  #if defined(CONFIG_PCI)
 -
  #define CONFIG_PCI_PNP                        /* do pci plug-and-play         */
+ 
+ #define CONFIG_EEPRO100
+ #undef CONFIG_TULIP
+ 
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup  */
+ #define CFG_PCI_SUBSYS_VENDORID 0x1057        /* Motorola                     */
+ 
  #endif        /* CONFIG_PCI */