diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-26 23:43:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-26 23:43:54 +0300 |
| commit | b95db6687f9ecc1705e2de0be216ab78439dbbf3 (patch) | |
| tree | c58565a7cca138c1764db6bc4f9508e62d08a27d /include | |
| parent | 80c8eae6ee66b52e1304c9ffd02b4472d5976608 (diff) | |
| parent | bc1727d242fa595c84e8f42b292e82151ba8cf06 (diff) | |
| download | linux-b95db6687f9ecc1705e2de0be216ab78439dbbf3.tar.xz | |
Merge branch 'dsa2-pdata-prepatory-patches'
Florian Fainelli says:
====================
net: dsa: Preparatory patches
This patch series extracts the 4 patches of the larger: net: dsa: Support for
pdata in dsa2 while we wait for feedback from Greg KH on the device references.
Changes in v2:
- rebased properly after the multi-MDIO bus support added to mv88e6xxx
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 08b340403927..92fd795e9573 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -387,7 +387,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) } void dsa_unregister_switch(struct dsa_switch *ds); -int dsa_register_switch(struct dsa_switch *ds, struct device_node *np); +int dsa_register_switch(struct dsa_switch *ds, struct device *dev); #ifdef CONFIG_PM_SLEEP int dsa_switch_suspend(struct dsa_switch *ds); int dsa_switch_resume(struct dsa_switch *ds); |