diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 18:49:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 18:49:48 +0100 |
| commit | 18ffa418aead13c56515ac74cd26105102128aca (patch) | |
| tree | 2096ea8db3b2594bd25ad39a70edc691219f669b /include/scsi/fc/fc_fcoe.h | |
| parent | ab76f3d771590d5c89faa3219559c5d3fc0ce0c2 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| download | op-kernel-dev-18ffa418aead13c56515ac74cd26105102128aca.zip op-kernel-dev-18ffa418aead13c56515ac74cd26105102128aca.tar.gz | |
Merge commit 'v2.6.29' into x86/setup-lzma
Diffstat (limited to 'include/scsi/fc/fc_fcoe.h')
| -rw-r--r-- | include/scsi/fc/fc_fcoe.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h index 57aaa8f..f271d9c 100644 --- a/include/scsi/fc/fc_fcoe.h +++ b/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. */ |
