Linux 3.1-rc6

[pandora-kernel.git] / drivers / net / s2io.h

diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 800b3a4..d559692 100644 (file)
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -939,7 +939,6 @@ struct s2io_nic {
 
        int task_flag;
        unsigned long long start_time;
-       struct vlan_group *vlgrp;
        int vlan_strip_flag;
 #define MSIX_FLG                0xA5
        int num_entries;
@@ -968,8 +967,8 @@ struct s2io_nic {
        u8  serial_num[VPD_STRING_LEN];
 };
 
-#define RESET_ERROR 1;
-#define CMD_ERROR   2;
+#define RESET_ERROR 1
+#define CMD_ERROR   2
 
 /*  OS related system calls */
 #ifndef readq