summaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/microchip
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2019-02-14 17:46:56 +0100
committerWolfram Sang <wsa@the-dreams.de>2019-02-14 17:46:56 +0100
commit338618ad2a01b821a34e089a6607143fb283dee3 (patch)
treeadf9aff96a5a087c820251f3eb09928b3271b007 /drivers/net/dsa/microchip
parent18769445ca55c2277d29e35ffda7e9a206b1758f (diff)
parentd13937116f1e82bf508a6325111b322c30c85eb9 (diff)
downloadlinux-338618ad2a01b821a34e089a6607143fb283dee3.tar.gz
linux-338618ad2a01b821a34e089a6607143fb283dee3.tar.bz2
linux-338618ad2a01b821a34e089a6607143fb283dee3.zip
Merge branch 'i2c/for-current' into i2c/for-5.1
Diffstat (limited to 'drivers/net/dsa/microchip')
-rw-r--r--drivers/net/dsa/microchip/ksz_common.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 3b12e2dcff31..8a5111f9414c 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -7,7 +7,6 @@
#include <linux/delay.h>
#include <linux/export.h>
-#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -15,7 +14,6 @@
#include <linux/phy.h>
#include <linux/etherdevice.h>
#include <linux/if_bridge.h>
-#include <linux/of_gpio.h>
#include <linux/of_net.h>
#include <net/dsa.h>
#include <net/switchdev.h>