diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
| commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
| tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /net/dsa/dsa.c | |
| parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index e63c554e0623..9f3209ff7ffd 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
| @@ -19,12 +19,10 @@ | |||
| 19 | #include <linux/of_mdio.h> | 19 | #include <linux/of_mdio.h> |
| 20 | #include <linux/of_platform.h> | 20 | #include <linux/of_platform.h> |
| 21 | #include <linux/of_net.h> | 21 | #include <linux/of_net.h> |
| 22 | #include <linux/of_gpio.h> | ||
| 23 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
| 24 | #include <linux/sysfs.h> | 23 | #include <linux/sysfs.h> |
| 25 | #include <linux/phy_fixed.h> | 24 | #include <linux/phy_fixed.h> |
| 26 | #include <linux/ptp_classify.h> | 25 | #include <linux/ptp_classify.h> |
| 27 | #include <linux/gpio/consumer.h> | ||
| 28 | #include <linux/etherdevice.h> | 26 | #include <linux/etherdevice.h> |
| 29 | 27 | ||
| 30 | #include "dsa_priv.h" | 28 | #include "dsa_priv.h" |