diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-10-05 14:19:02 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-10-05 14:19:02 +0200 |
| commit | 05552832204e37e038d550e1354300eb11a9e5ec (patch) | |
| tree | 69f7ef1f98e2382b35d7e6098705c00fcfa3d3c3 /net/dsa/dsa.c | |
| parent | 49d54abee9d1507e117a4218dc5baa3ebc5b93f1 (diff) | |
| parent | 9a9e295e7c5c0409c020088b0ae017e6c2b7df6e (diff) | |
Merge tag 'at24-4.20-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.20
AT24 updates for 4.20
Single patch from Wang Xin improving the read/write loop in at24
under high load.
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 @@ #include <linux/of_mdio.h> #include <linux/of_platform.h> #include <linux/of_net.h> -#include <linux/of_gpio.h> #include <linux/netdevice.h> #include <linux/sysfs.h> #include <linux/phy_fixed.h> #include <linux/ptp_classify.h> -#include <linux/gpio/consumer.h> #include <linux/etherdevice.h> #include "dsa_priv.h" |