diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-14 01:41:05 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-14 01:41:05 +0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /drivers/net | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
| download | linux-83400207a07584539366f6859362db6872809a12.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/port.c | 5 | ||||
| -rw-r--r-- | drivers/net/smc91x.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c index 7cce3342ef8c..606aa58afdea 100644 --- a/drivers/net/mlx4/port.c +++ b/drivers/net/mlx4/port.c @@ -299,13 +299,14 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) struct mlx4_cmd_mailbox *mailbox; int err; + if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH) + return 0; + mailbox = mlx4_alloc_cmd_mailbox(dev); if (IS_ERR(mailbox)) return PTR_ERR(mailbox); memset(mailbox->buf, 0, 256); - if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH) - return 0; ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port]; err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT, diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 912308eec865..329f890e2903 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, * MN10300/AM33 configuration */ -#include <asm/unit/smc91111.h> +#include <unit/smc91111.h> #else |