diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-03-20 15:53:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-20 15:53:15 -0700 |
| commit | 7582a33557cc6dc42b4c6918c6e7f8e465b72a70 (patch) | |
| tree | b0eb644d87ab5b096a900a36c5ffae80373a6e18 /drivers | |
| parent | MAINTAINERS: bluez-devel is subscribers-only (diff) | |
| download | linux-dev-7582a33557cc6dc42b4c6918c6e7f8e465b72a70.tar.xz linux-dev-7582a33557cc6dc42b4c6918c6e7f8e465b72a70.zip | |
[TG3]: Fix build warning on sparc32.
Sparc MAC address support should be protected consistently
with CONFIG_SPARC, but there was a stray CONFIG_SPARC64
case.
Bump driver version and release date.
Reported by Andrew Morton.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 26ffb67f1da2..f9ef8bd8b11e 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -64,8 +64,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.87" -#define DRV_MODULE_RELDATE "December 20, 2007" +#define DRV_MODULE_VERSION "3.88" +#define DRV_MODULE_RELDATE "March 20, 2008" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -11841,7 +11841,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp) } if (!is_valid_ether_addr(&dev->dev_addr[0])) { -#ifdef CONFIG_SPARC64 +#ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; #endif |