diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-13 03:30:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 12:58:59 -0400 |
commit | c5d6471ff9172e4d8f7a5b484b459c56904ae1f0 (patch) | |
tree | 9b480559631415483c08f8593b56e82bf443c575 | |
parent | 13bcd5d0e21e3ca726965371ada8ff6c64af288f (diff) |
fallout from DECLARE_MAC_BUF patches
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/net/atarilance.c | 2 | ||||
-rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index ebf1a3a88e15..b74dbeef8050 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -1023,7 +1023,7 @@ static int lance_rx( struct net_device *dev ) | |||
1023 | DECLARE_MAC_BUF(mac); | 1023 | DECLARE_MAC_BUF(mac); |
1024 | DECLARE_MAC_BUF(mac2); | 1024 | DECLARE_MAC_BUF(mac2); |
1025 | 1025 | ||
1026 | printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s ", | 1026 | printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s " |
1027 | "data %02x %02x %02x %02x %02x %02x %02x %02x " | 1027 | "data %02x %02x %02x %02x %02x %02x %02x %02x " |
1028 | "len %d\n", | 1028 | "len %d\n", |
1029 | dev->name, ((u_short *)data)[6], | 1029 | dev->name, ((u_short *)data)[6], |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b33d21f4efff..84f2d6382f1e 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -784,7 +784,6 @@ static int mv643xx_eth_open(struct net_device *dev) | |||
784 | unsigned int port_num = mp->port_num; | 784 | unsigned int port_num = mp->port_num; |
785 | unsigned int size; | 785 | unsigned int size; |
786 | int err; | 786 | int err; |
787 | DECLARE_MAC_BUF(mac); | ||
788 | 787 | ||
789 | /* Clear any pending ethernet port interrupts */ | 788 | /* Clear any pending ethernet port interrupts */ |
790 | mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0); | 789 | mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0); |
@@ -1296,6 +1295,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
1296 | struct ethtool_cmd cmd; | 1295 | struct ethtool_cmd cmd; |
1297 | int duplex = DUPLEX_HALF; | 1296 | int duplex = DUPLEX_HALF; |
1298 | int speed = 0; /* default to auto-negotiation */ | 1297 | int speed = 0; /* default to auto-negotiation */ |
1298 | DECLARE_MAC_BUF(mac); | ||
1299 | 1299 | ||
1300 | pd = pdev->dev.platform_data; | 1300 | pd = pdev->dev.platform_data; |
1301 | if (pd == NULL) { | 1301 | if (pd == NULL) { |