Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / net / fec.c

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 63eaf5de2300d2780a58298e4e2e156f5097279c..28db6919c5262ba6b7007dbede97983d0697cbd6 100644 (file)
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1155,6 +1155,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)