summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-02 00:58:31 +0300
committerTom Rini <trini@konsulko.com>2020-05-04 14:27:06 +0300
commit1d5d0275d7684005643952b4591eb5899f55beaf (patch)
tree2f579f6ce02ab71c8a00387ca965e970b696380e /include
parent20a154f95bfe0a3b5bfba90bea7f001c58217536 (diff)
parent8148693b988fb36463dbc12cef4b7947acae9846 (diff)
downloadu-boot-1d5d0275d7684005643952b4591eb5899f55beaf.tar.xz
Merge branch 'next' of git://git.denx.de/u-boot-sh
This is part 1 of big network cleanup / DM conversion. The dc2114x/rtl8139/pcnet/tulip PCI adapter drivers received checkpatch cleanups in preparation for DM conversion. The smc911x is converted to DM completely. The dwc_eth_qos cache fixes are applied.
Diffstat (limited to 'include')
-rw-r--r--include/configs/malta.h1
-rw-r--r--include/netdev.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/malta.h b/include/configs/malta.h
index bb8a44433e..d41b80c7dc 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -16,7 +16,6 @@
#define CONFIG_PCI_GT64120
#define CONFIG_PCI_MSC01
#define CONFIG_PCNET
-#define CONFIG_PCNET_79C973
#define PCNET_HAS_PROM
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
diff --git a/include/netdev.h b/include/netdev.h
index 68a3fceab6..f2d21c45d0 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -125,6 +125,7 @@ int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
/*
* Allow FEC to fine-tune MII configuration on boards which require this.
*/
+struct eth_device;
int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int));
#endif