Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -565,7 +565,7 @@ static int phylink_register_sfp(struct phylink *pl,
|
||||
|
||||
/**
|
||||
* phylink_create() - create a phylink instance
|
||||
* @ndev: a pointer to the &struct net_device
|
||||
* @config: a pointer to the target &struct phylink_config
|
||||
* @fwnode: a pointer to a &struct fwnode_handle describing the network
|
||||
* interface
|
||||
* @iface: the desired link mode defined by &typedef phy_interface_t
|
||||
|
Reference in New Issue
Block a user