From: Wolfgang Denk <wd@denx.de>
Date: Tue, 27 May 2008 10:56:01 +0000 (+0200)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v1.3.4-rc1~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f1554841a4c8e069d331176f0c3059fb2bb8280;p=kernel%2Fu-boot.git

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

Conflicts:

	include/configs/socrates.h

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

1f1554841a4c8e069d331176f0c3059fb2bb8280
diff --cc include/configs/socrates.h
index 00c0dab,c3ecd6f..23ed87f
--- a/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 */