drivers/net/e1000: Introduce CONFIG_E1000_NO_NVM

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

diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index ab5eec7727b4720457587691d1944ab4cb48efca..e6cd3e9ba07e23fb6f3e1893afd0cc9f828e1648 100644 (file)
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -78,7 +78,6 @@ Add SNMP
 /* NE2000 base header file */
 #include "ne2000_base.h"
 
-#define mdelay(n) udelay((n)*1000)
 /* find prom (taken from pc_net_cs.c from Linux) */
 
 #include "8390.h"
@@ -164,7 +163,8 @@ static hw_info_t hw_info[] = {
        { /* Volktek NPL-402CT */ 0x0060, 0x00, 0x40, 0x05, 0 },
        { /* NEC PC-9801N-J12 */ 0x0ff0, 0x00, 0x00, 0x4c, 0 },
        { /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 },
-       { /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 }
+       { /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 },
+       { /* RTL8019AS */ 0x0, 0x0, 0x18, 0x5f, 0 }
 };
 
 #define NR_INFO                (sizeof(hw_info)/sizeof(hw_info_t))
@@ -228,7 +228,7 @@ int get_prom(u8* mac_addr, u8* base_addr)
 
        mdelay (10);
 
-       for (i = 0; i < sizeof (program_seq) / sizeof (program_seq[0]); i++)
+       for (i = 0; i < ARRAY_SIZE(program_seq); i++)
                n2k_outb (program_seq[i].value, program_seq[i].offset);
 
        PRINTK ("PROM:");