net: phy: genphy: Allow overwriting features

[u-boot] / drivers / net / e1000.h

diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index da04cabd91f9db0dac9b6e5fbcc0e36cfc13ec0a..c851922ae5c791670778b9111e96cade2fea3419 100644 (file)
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -22,7 +22,10 @@
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
+/* Avoids a compile error since struct eth_device is not defined */
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif
 #include <asm/io.h>
 #include <pci.h>
 
@@ -1073,7 +1076,9 @@ typedef enum {
 struct e1000_hw {
        const char *name;
        struct list_head list_node;
+#ifndef CONFIG_DM_ETH
        struct eth_device *nic;
+#endif
 #ifdef CONFIG_E1000_SPI
        struct spi_slave spi;
 #endif