Mercurial > nand-ecoscentric

changeset 592:52b1b868a0ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i82559 tweak
author msalter
date Wed, 12 Feb 2003 13:52:12 +0000
parents 3e913eba92cc
children af7aa9ef2953
files packages/devs/eth/intel/i82559/current/ChangeLog packages/devs/eth/intel/i82559/current/src/if_i82559.c
diffstat 2 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/eth/intel/i82559/current/ChangeLog
+++ b/packages/devs/eth/intel/i82559/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-12  Mark Salter  <msalter@redhat.com>
+
+	* src/if_i82559.c: Remove restriction preventing combination of
+	*_GET_ESA and *_HAS_EEPROM.
+
 2003-01-03  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/if_i82559.c: 
--- a/packages/devs/eth/intel/i82559/current/src/if_i82559.c
+++ b/packages/devs/eth/intel/i82559/current/src/if_i82559.c
@@ -8,8 +8,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-// Copyright (C) 2002, 2003 Gary Thomas
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -199,24 +198,12 @@
 #endif
 #endif
 
-#ifdef CYGHWR_DEVS_ETH_INTEL_I82559_GET_ESA
-#ifndef CYGHWR_DEVS_ETH_INTEL_I82559_HAS_NO_EEPROM
-#error This platform has EEPROM, yet external ..._GET_ESA is defined
-#endif
-#endif
-
 #ifdef CYGHWR_DEVS_ETH_INTEL_I82559_HAS_NO_EEPROM
 #ifdef CYGHWR_DEVS_ETH_INTEL_I82559_HAS_ONE_EEPROM
 #error This platform has no EEPROM, yet it also HAS_ONE_EEPROM
 #endif
 #endif
 
-#ifdef CYGHWR_DEVS_ETH_INTEL_I82559_GET_ESA
-#ifdef CYGHWR_DEVS_ETH_INTEL_I82559_HAS_ONE_EEPROM
-#error This platform has one EEPROM, yet external ..._GET_ESA is defined
-#endif
-#endif
-
 // ------------------------------------------------------------------------
 
 #ifdef CYGDBG_DEVS_ETH_INTEL_I82559_CHATTER