diff --git a/[refs] b/[refs] index a9acc5f7aae3..f24e68813d62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58f3e0a864c46dadbeadf682e6bbdcab14ba19d3 +refs/heads/master: fb922b0de60d64473f68515a90a7df603267d245 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index a515acccc61f..682e7f0b5581 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -1240,6 +1240,7 @@ static void __inline__ fec_phy_ack_intr(void) icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); *icrp = 0x0d000000; } +#endif #ifdef CONFIG_M5272 static void __inline__ fec_get_mac(struct net_device *dev)