diff --git a/[refs] b/[refs] index 8e6567746642..ad8787763265 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d80aa31bbffc4bc8b5be36c57cbea128f52e1e1f +refs/heads/master: 61362766d769c934a9d12d5516323c544c161908 diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index 68bdcf4a795c..9f04cab92f95 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -18,21 +18,17 @@ * 2 of the License, or (at your option) any later version. */ -#include /* for copy_from_user */ #include #include #include #include -#include -#include -#include #include -#include -#include #include #include +#include #include #include +#include #include #include "vlan.h" diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c index c3adba9501cb..6b985f23fd9f 100644 --- a/trunk/net/8021q/vlan_dev.c +++ b/trunk/net/8021q/vlan_dev.c @@ -21,22 +21,15 @@ */ #include -#include -#include -#include -#include /* for copy_from_user */ #include #include #include #include -#include -#include #include #include "vlan.h" #include "vlanproc.h" #include -#include /* * Rebuild the Ethernet MAC header. This is called after an ARP diff --git a/trunk/net/8021q/vlanproc.c b/trunk/net/8021q/vlanproc.c index 6073a888b6f9..0feefa4e1a4b 100644 --- a/trunk/net/8021q/vlanproc.c +++ b/trunk/net/8021q/vlanproc.c @@ -18,16 +18,9 @@ *****************************************************************************/ #include -#include /* offsetof(), etc. */ -#include /* return codes */ +#include #include -#include /* kmalloc(), kfree() */ -#include -#include /* inline mem*, str* functions */ -#include /* __initfunc et al. */ -#include /* htons(), etc. */ -#include /* copy_to_user */ -#include +#include #include #include #include