diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
| commit | 32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch) | |
| tree | 35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /include | |
| parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
| parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/scb9328.h | 4 | ||||
| -rw-r--r-- | include/configs/trizepsiv.h | 4 | ||||
| -rw-r--r-- | include/pci_ids.h | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index d140241bff..4ae25adde0 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -257,13 +257,9 @@ #define CFG_CS5L_VAL 0x00000D03 #define CONFIG_DRIVER_DM9000 1 -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x16000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE+4) -/* #define CONFIG_DM9000_USE_8BIT */ -#define CONFIG_DM9000_USE_16BIT -/* #define CONFIG_DM9000_USE_32BIT */ /* f_{dpll}=2*f{ref}*(MFI+MFN/(MFD+1))/(PD+1) f_ref=16,777MHz diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 25155ad349..f77dd14f1a 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -276,13 +276,9 @@ #define CFG_MCIO1_VAL 0x0000c108 #define CONFIG_DRIVER_DM9000 1 -#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DM9000_BASE 0x08000000 #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE+0x8004) -/* #define CONFIG_DM9000_USE_8BIT */ -/* #define CONFIG_DM9000_USE_16BIT */ -#define CONFIG_DM9000_USE_32BIT #define CONFIG_USB_OHCI_NEW 1 #define CFG_USB_OHCI_BOARD_INIT 1 diff --git a/include/pci_ids.h b/include/pci_ids.h index 61c22031e9..d061017911 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -1812,7 +1812,8 @@ #define PCI_DEVICE_ID_INTEL_82434 0x04a3 #define PCI_DEVICE_ID_INTEL_I960 0x0960 #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 -#define PCI_DEVICE_ID_INTEL_82541ER 0x1078 +#define PCI_DEVICE_ID_INTEL_82541ER 0x1078 +#define PCI_DEVICE_ID_INTEL_82541GI_LF 0x107c #define PCI_DEVICE_ID_INTEL_82542 0x1000 #define PCI_DEVICE_ID_INTEL_82543GC_FIBER 0x1001 #define PCI_DEVICE_ID_INTEL_82543GC_COPPER 0x1004 |