diff --git a/[refs] b/[refs] index 941c630cd231..888c2185d646 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 422819cfa3a2605a0b3bdc33aaef0bc2feaeaada +refs/heads/master: 74846bf85e42b4ba851d3f0dd67aa1df245895f9 diff --git a/trunk/include/scsi/fc/fc_fcoe.h b/trunk/include/scsi/fc/fc_fcoe.h index 57aaa8f0d613..f271d9cc0fc2 100644 --- a/trunk/include/scsi/fc/fc_fcoe.h +++ b/trunk/include/scsi/fc/fc_fcoe.h @@ -31,10 +31,6 @@ #define ETH_P_FCOE 0x8906 /* FCOE ether type */ #endif -#ifndef ETH_P_8021Q -#define ETH_P_8021Q 0x8100 -#endif - /* * FC_FCOE_OUI hasn't been standardized yet. XXX TBD. */