Merge branch 'master' of git://git.denx.de/u-boot-coldfire

[oweals/u-boot.git] / drivers / net / rtl8019.c

diff --git a/drivers/net/rtl8019.c b/drivers/net/rtl8019.c
index 409a69f0214e21d8088b98ed858babdda15974f1..3ddf91793cd4baad16733360bf45eed3ce60e232 100644 (file)
--- a/drivers/net/rtl8019.c
+++ b/drivers/net/rtl8019.c
@@ -32,20 +32,13 @@
 #include "rtl8019.h"
 #include <net.h>
 
-#ifdef CONFIG_DRIVER_RTL8019
-
-#if defined(CONFIG_CMD_NET)
-
-
 /* packet page register access functions */
 
-
 static unsigned char get_reg (unsigned int regno)
 {
        return (*(unsigned char *) regno);
 }
 
-
 static void put_reg (unsigned int regno, unsigned char val)
 {
        *(volatile unsigned char *) regno = val;
@@ -91,7 +84,6 @@ void rtl8019_get_enetaddr (uchar * addr)
        put_reg (RTL8019_COMMAND, RTL8019_PAGE0);
 }
 
-
 void eth_halt (void)
 {
        put_reg (RTL8019_COMMAND, 0x01);
@@ -134,7 +126,6 @@ int eth_init (bd_t * bd)
        return 0;
 }
 
-
 static unsigned char nic_to_pc (void)
 {
        unsigned char rec_head_status;
@@ -276,7 +267,3 @@ extern int eth_send (volatile void *packet, int length)
 
        return 0;
 }
-
-#endif /* COMMANDS & CFG_NET */
-
-#endif /* CONFIG_DRIVER_RTL8019 */