fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / 8021q / vlanproc.c

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 5a5f9cd..a8fc0de 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -17,13 +17,12 @@
  * Jan 20, 1998        Ben Greear     Initial Version
  *****************************************************************************/
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/stddef.h>      /* offsetof(), etc. */
 #include <linux/errno.h>       /* return codes */
 #include <linux/kernel.h>
 #include <linux/slab.h>                /* kmalloc(), kfree() */
-#include <linux/mm.h>          /* verify_area(), etc. */
+#include <linux/mm.h>
 #include <linux/string.h>      /* inline mem*, str* functions */
 #include <linux/init.h>                /* __initfunc et al. */
 #include <asm/byteorder.h>     /* htons(), etc. */
@@ -239,7 +238,7 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
  */
 
 /* starting at dev, find a VLAN device */
-struct net_device *vlan_skip(struct net_device *dev) 
+static struct net_device *vlan_skip(struct net_device *dev) 
 {
        while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN)) 
                dev = dev->next;