diff -urNp linux-2.6.10-rc3-bk11-aoe/drivers/block/aoe/aoe.h linux-2.6.10-rc3-bk11-aoe-2/drivers/block/aoe/aoe.h
--- linux-2.6.10-rc3-bk11-aoe/drivers/block/aoe/aoe.h	2004-12-20 11:15:04.000000000 -0500
+++ linux-2.6.10-rc3-bk11-aoe-2/drivers/block/aoe/aoe.h	2004-12-20 11:16:23.000000000 -0500
@@ -26,7 +26,6 @@ enum {
 	AOECCMD_FSET,
 
 	AOE_HVER = 0x10,
-	ETH_P_AOE = 0x88a2,
 };
 
 struct aoe_hdr {
diff -urNp linux-2.6.10-rc3-bk11-aoe/include/linux/if_ether.h linux-2.6.10-rc3-bk11-aoe-2/include/linux/if_ether.h
--- linux-2.6.10-rc3-bk11-aoe/include/linux/if_ether.h	2004-12-20 10:51:20.000000000 -0500
+++ linux-2.6.10-rc3-bk11-aoe-2/include/linux/if_ether.h	2004-12-20 11:16:55.000000000 -0500
@@ -69,7 +69,7 @@
 #define ETH_P_ATMFATE	0x8884		/* Frame-based ATM Transport
 					 * over Ethernet
 					 */
-#define ETH_P_EDP2	0x88A2		/* Coraid EDP2			*/
+#define ETH_P_AOE	0x88A2		/* ATA over Ethernet		*/
 
 /*
  *	Non DIX types. Won't clash for 1500 types.