drm: merge Linux master into HEAD

[mv-sheeva.git] / include / scsi / fc / fc_fcoe.h

diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index 57aaa8f0d6133acf346af2df52912c06e6774311..ccb3dbe90463b134dfe5afb745653b59af9a204b 100644 (file)
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -24,17 +24,6 @@
  * FCoE - Fibre Channel over Ethernet.
  */
 
-/*
- * The FCoE ethertype eventually goes in net/if_ether.h.
- */
-#ifndef ETH_P_FCOE
-#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.
  */