Merge with /home/wd/git/u-boot/master

[u-boot] / drivers / sk98lin / h / skaddr.h

diff --git a/drivers/sk98lin/h/skaddr.h b/drivers/sk98lin/h/skaddr.h
index 7f85ea7e7965d152aab4d1868e75d765bf77a8b5..711f873e7f0190f572f900518a0a0211b8ae2a75 100644 (file)
--- a/drivers/sk98lin/h/skaddr.h
+++ b/drivers/sk98lin/h/skaddr.h
@@ -28,90 +28,90 @@
  *     $Log: skaddr.h,v $
  *     Revision 1.26  2002/11/15 07:24:42  tschilli
  *     SK_ADDR_EQUAL macro fixed.
- *     
+ *
  *     Revision 1.25  2002/06/10 13:55:18  tschilli
  *     Changes for handling YUKON.
  *     All changes are internally and not visible to the programmer
  *     using this module.
- *     
+ *
  *     Revision 1.24  2001/01/22 13:41:34  rassmann
  *     Supporting two nets on dual-port adapters.
- *     
+ *
  *     Revision 1.23  2000/08/10 11:27:50  rassmann
  *     Editorial changes.
  *     Preserving 32-bit alignment in structs for the adapter context.
- *     
+ *
  *     Revision 1.22  2000/08/07 11:10:40  rassmann
  *     Editorial changes.
- *     
+ *
  *     Revision 1.21  2000/05/04 09:39:59  rassmann
  *     Editorial changes.
  *     Corrected multicast address hashing.
- *     
+ *
  *     Revision 1.20  1999/11/22 13:46:14  cgoos
  *     Changed license header to GPL.
  *     Allowing overwrite for SK_ADDR_EQUAL.
- *     
+ *
  *     Revision 1.19  1999/05/28 10:56:07  rassmann
  *     Editorial changes.
- *     
+ *
  *     Revision 1.18  1999/04/06 17:22:04  rassmann
  *     Added private "ActivePort".
- *     
+ *
  *     Revision 1.17  1999/01/14 16:18:19  rassmann
  *     Corrected multicast initialization.
- *     
+ *
  *     Revision 1.16  1999/01/04 10:30:36  rassmann
  *     SkAddrOverride only possible after SK_INIT_IO phase.
- *     
+ *
  *     Revision 1.15  1998/12/29 13:13:11  rassmann
  *     An address override is now preserved in the SK_INIT_IO phase.
  *     All functions return an int now.
  *     Extended parameter checking.
- *     
+ *
  *     Revision 1.14  1998/11/24 12:39:45  rassmann
  *     Reserved multicast entry for BPDU address.
  *     13 multicast entries left for protocol.
- *     
+ *
  *     Revision 1.13  1998/11/13 17:24:32  rassmann
  *     Changed return value of SkAddrOverride to int.
- *     
+ *
  *     Revision 1.12  1998/11/13 16:56:19  rassmann
  *     Added macro SK_ADDR_COMPARE.
  *     Changed return type of SkAddrOverride to SK_BOOL.
- *     
+ *
  *     Revision 1.11  1998/10/28 18:16:35  rassmann
  *     Avoiding I/Os before SK_INIT_RUN level.
  *     Aligning InexactFilter.
- *     
+ *
  *     Revision 1.10  1998/10/22 11:39:10  rassmann
  *     Corrected signed/unsigned mismatches.
- *     
+ *
  *     Revision 1.9  1998/10/15 15:15:49  rassmann
  *     Changed Flags Parameters from SK_U8 to int.
  *     Checked with lint.
- *     
+ *
  *     Revision 1.8  1998/09/24 19:15:12  rassmann
  *     Code cleanup.
- *     
+ *
  *     Revision 1.7  1998/09/18 20:22:13  rassmann
  *     Added HW access.
- *     
+ *
  *     Revision 1.6  1998/09/04 19:40:20  rassmann
  *     Interface enhancements.
- *     
+ *
  *     Revision 1.5  1998/09/04 12:40:57  rassmann
  *     Interface cleanup.
- *     
+ *
  *     Revision 1.4  1998/09/04 12:14:13  rassmann
  *     Interface cleanup.
- *     
+ *
  *     Revision 1.3  1998/09/02 16:56:40  rassmann
  *     Updated interface.
- *     
+ *
  *     Revision 1.2  1998/08/27 14:26:09  rassmann
  *     Updated interface.
- *     
+ *
  *     Revision 1.1  1998/08/21 08:31:08  rassmann
  *     First public version.
  *
@@ -401,7 +401,7 @@ extern      int     SkAddrGmacPromiscuousChange(
        SK_AC   *pAC,
        SK_IOC  IoC,
        SK_U32  PortNumber,
-       int     NewPromMode);   
+       int     NewPromMode);
 
 extern int     SkAddrSwap(
        SK_AC   *pAC,