diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-01-18 21:14:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 01:59:18 -0800 |
| commit | 98f672ca9978c6e5997dbe905c91a73593148a7e (patch) | |
| tree | cf194d68ccecde771a86fef2b3e2a9cef526c6bd | |
| parent | 357d46a17e54c9a87e0e6ef3930ff4ab2d232b81 (diff) | |
| download | op-kernel-dev-98f672ca9978c6e5997dbe905c91a73593148a7e.zip op-kernel-dev-98f672ca9978c6e5997dbe905c91a73593148a7e.tar.gz | |
bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | 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; |
