summaryrefslogtreecommitdiff
path: root/drivers/net/fec.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-17 04:35:26 +0400
committerDavid S. Miller <davem@davemloft.net>2009-04-17 04:35:26 +0400
commita54bfa40fd16aeb90bc556189221576f746f8567 (patch)
tree176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /drivers/net/fec.c
parentfe957c40ec5e2763b9977c565beab3bde3aaf85b (diff)
parent134ffb4cad92a6aa534e55a9be145bca780a32c1 (diff)
downloadlinux-a54bfa40fd16aeb90bc556189221576f746f8567.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r--drivers/net/fec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 63eaf5de2300..28db6919c526 100644
--- 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)