netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h
@ 2010-01-19  7:14 Mike Frysinger
  2010-01-19 10:00 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2010-01-19  7:14 UTC (permalink / raw)
  To: netdev, David S. Miller

This driver tweaks VR_CTL, so pull in the header for the bit defines.
Also switch to the new define name as the old one has gone away.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
note: this fixes a build error in current 2.6.33-rcX

 drivers/net/bfin_mac.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 8ffea39..0b23bc4 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -33,6 +33,7 @@
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
 
+#include <asm/dpmc.h>
 #include <asm/blackfin.h>
 #include <asm/cacheflush.h>
 #include <asm/portmux.h>
@@ -386,8 +387,8 @@ static int mii_probe(struct net_device *dev)
 	u32 sclk, mdc_div;
 
 	/* Enable PHY output early */
-	if (!(bfin_read_VR_CTL() & PHYCLKOE))
-		bfin_write_VR_CTL(bfin_read_VR_CTL() | PHYCLKOE);
+	if (!(bfin_read_VR_CTL() & CLKBUFOE))
+		bfin_write_VR_CTL(bfin_read_VR_CTL() | CLKBUFOE);
 
 	sclk = get_sclk();
 	mdc_div = ((sclk / MDC_CLK) / 2) - 1;
-- 
1.6.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h
  2010-01-19  7:14 [PATCH] bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h Mike Frysinger
@ 2010-01-19 10:00 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-01-19 10:00 UTC (permalink / raw)
  To: vapier; +Cc: netdev

From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 19 Jan 2010 02:14:12 -0500

> This driver tweaks VR_CTL, so pull in the header for the bit defines.
> Also switch to the new define name as the old one has gone away.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> note: this fixes a build error in current 2.6.33-rcX

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-01-19 10:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-19  7:14 [PATCH] bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h Mike Frysinger
2010-01-19 10:00 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).