Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull

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

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 6073a888b6f92610ce6a3c95b509e4293618976b..0feefa4e1a4b784b60daea32cde2e7a6aa83d0bc 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -18,16 +18,9 @@
  *****************************************************************************/
 
 #include <linux/module.h>
-#include <linux/stddef.h>      /* offsetof(), etc. */
-#include <linux/errno.h>       /* return codes */
+#include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>                /* kmalloc(), kfree() */
-#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. */
-#include <asm/uaccess.h>       /* copy_to_user */
-#include <asm/io.h>
+#include <linux/string.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/fs.h>