fat: Add printf attribute to fat_fs_panic()

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

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 08b54b593d565df95a7b64629b793371df8c5d4d..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>
@@ -290,7 +283,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
        static const char fmt[] = "%30s %12lu\n";
        int i;
 
-       if (!(vlandev->priv_flags & IFF_802_1Q_VLAN))
+       if (!is_vlan_dev(vlandev))
                return 0;
 
        seq_printf(seq,