aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarek Vasut2020-05-17 18:12:19 +0200
committerMarek Vasut2020-06-18 19:34:40 +0200
commit1524e409ef130e20e6554446d08be967422d27f7 (patch)
tree1295bc24c3b35fc151dbe1b96d9abfad68292138 /drivers
parent97d5c145592c1d2aa38a8d074fed9aee059ac119 (diff)
net: pcnet: Drop PCNET_HAS_PROM
All of one PCNET users has this option set, make this default and drop this config option. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/pcnet.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index c6f080d956b..edc4dba24cb 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -241,10 +241,7 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
{
int chip_version;
char *chipname;
-
-#ifdef PCNET_HAS_PROM
int i;
-#endif
/* Reset the PCnet controller */
pcnet_reset(dev);
@@ -279,7 +276,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
PCNET_DEBUG1("AMD %s\n", chipname);
-#ifdef PCNET_HAS_PROM
/*
* In most chips, after a chip reset, the ethernet address is read from
* the station address PROM at the base address and programmed into the
@@ -293,7 +289,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
dev->enetaddr[2 * i] = val & 0x0ff;
dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
}
-#endif /* PCNET_HAS_PROM */
return 0;
}