rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / drivers / net / lan91c96.c

diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index ecdcbd9b32b10c27aba0281c7cfa43d8f4cff487..318bdf4a15c066b1ae49d12f1ec17e4df0eafecb 100644 (file)
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -36,12 +36,12 @@
  *   AUI/TP selection  ( mine has 10Base2/10BaseT select )
  *
  * Arguments:
- *     io      = for the base address
+ *     io      = for the base address
  *     irq     = for the IRQ
  *
  * author:
- *     Erik Stahlman                           ( erik@vt.edu )
- *     Daris A Nevil                           ( dnevil@snmc.com )
+ *     Erik Stahlman                           ( erik@vt.edu )
+ *     Daris A Nevil                           ( dnevil@snmc.com )
  *
  *
  * Hardware multicast code from Peter Cammaert ( pc@denkart.be )
@@ -53,7 +53,7 @@
  *    o   lan91c96.c (Intel Diagnostic Manager driver)
  *
  * History:
- *     04/30/03  Mathijs Haarman       Modified smc91111.c (u-boot version)
+ *     04/30/03  Mathijs Haarman       Modified smc91111.c (u-boot version)
  *                                     for lan91c96
  *---------------------------------------------------------------------------
  */
@@ -63,10 +63,6 @@
 #include "lan91c96.h"
 #include <net.h>
 
-#ifdef CONFIG_DRIVER_LAN91C96
-
-#if defined(CONFIG_CMD_NET)
-
 /*------------------------------------------------------------------------
  *
  * Configuration options, for the experienced user to change.
@@ -271,7 +267,7 @@ static void smc_shutdown (void);
 
 static int poll4int (byte mask, int timeout)
 {
-       int tmo = get_timer (0) + timeout * CFG_HZ;
+       int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
        int is_timeout = 0;
        word old_bank = SMC_inw (LAN91C96_BANK_SELECT);
 
@@ -296,8 +292,8 @@ static int poll4int (byte mask, int timeout)
 /*
  * Function: smc_reset( void )
  * Purpose:
- *     This sets the SMC91111 chip to its normal state, hopefully from whatever
- *     mess that any other DOS driver has put it in.
+ *     This sets the SMC91111 chip to its normal state, hopefully from whatever
+ *     mess that any other DOS driver has put it in.
  *
  * Maybe I should reset more registers to defaults in here?  SOFTRST  should
  * do that for me.
@@ -397,7 +393,7 @@ static void smc_shutdown ()
  *     This sends the actual packet to the SMC9xxx chip.
  *
  * Algorithm:
- *     First, see if a saved_skb is available.
+ *     First, see if a saved_skb is available.
  *             ( this should NOT be called if there is no 'saved_skb'
  *     Now, find the packet number that the chip allocated
  *     Point the data pointers at it in memory
@@ -405,9 +401,9 @@ static void smc_shutdown ()
  *     Dump the packet to chip memory
  *     Check if a last byte is needed ( odd length packet )
  *             if so, set the control flag right
- *     Tell the card to send it
+ *     Tell the card to send it
  *     Enable the transmit interrupt, so I know if it failed
- *     Free the kernel data if I actually sent it.
+ *     Free the kernel data if I actually sent it.
  */
 static int smc_send_packet (volatile void *packet, int packet_length)
 {
@@ -865,9 +861,6 @@ static int smc_hw_init ()
 }
 #endif /* 0 */
 
-#endif /* COMMANDS & CFG_NET */
-
-
 /* smc_get_ethaddr (bd_t * bd)
  *
  * This checks both the environment and the ROM for an ethernet address. If
@@ -963,5 +956,3 @@ int get_rom_mac (unsigned char *v_rom_mac)
        return (1);
 #endif
 }
-
-#endif /* CONFIG_DRIVER_LAN91C96 */