diff --git a/[refs] b/[refs] index c65f25ae829c..fdd75d86f1c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080853afe3da90d3c54a2eea8a9ab6a2f814fb0e +refs/heads/master: f0d3464f5cd1002ad5c1f1116cc84a8815c41476 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index e3a1732d4c1e..52a6f945c001 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -99,8 +99,6 @@ static unsigned char fec_mac_default[] = { #define FEC_FLASHMAC 0xf0006006 #elif defined(CONFIG_GILBARCONAP) || defined(CONFIG_SCALES) #define FEC_FLASHMAC 0xf0006000 -#elif defined (CONFIG_MTD_KeyTechnology) -#define FEC_FLASHMAC 0xffe04000 #elif defined(CONFIG_CANCam) #define FEC_FLASHMAC 0xf0020000 #elif defined (CONFIG_M5272C3)