Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e0616e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-switchdev-h-inclusion-removal' 



Florian Fainelli says:

====================
net: switchdev.h inclusion removal

This targets a few drivers that no longer to have net/switchdev.h
included.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6a5f9161 47f70626

drivers/net/bonding/bond_main.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
#include <net/pkt_sched.h>

#include <linux/rculist.h>

#include <net/flow_dissector.h>

#include <net/switchdev.h>

#include <net/bonding.h>

#include <net/bond_3ad.h>

#include <net/bond_alb.h>

drivers/net/ethernet/netronome/nfp/nfp_port.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <net/switchdev.h>



#include "nfpcore/nfp_cpp.h"

#include "nfpcore/nfp_nsp.h"

drivers/net/team/team.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <net/genetlink.h>

#include <net/netlink.h>

#include <net/sch_generic.h>

#include <net/switchdev.h>

#include <generated/utsrelease.h>

#include <linux/if_team.h>

net/8021q/vlan_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/ethtool.h>

#include <linux/phy.h>

#include <net/arp.h>

#include <net/switchdev.h>



#include "vlan.h"

#include "vlanproc.h"