Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index c32d27af0a3fd3d4a98e35552ba2337f09abff86..a8fc0de1f969a89e15382c54fd675e53f3eccd72 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. */