diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 16:04:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 16:04:00 +0000 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/net/mlx4/mr.c | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
| download | op-kernel-dev-f315ccb3e679f271583f2a4f463ad9b65665b751.zip op-kernel-dev-f315ccb3e679f271583f2a4f463ad9b65665b751.tar.gz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/mlx4/mr.c')
| -rw-r--r-- | drivers/net/mlx4/mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index 0c05a10..9c9e308 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c @@ -122,7 +122,7 @@ static void mlx4_buddy_free(struct mlx4_buddy *buddy, u32 seg, int order) spin_unlock(&buddy->lock); } -static int __devinit mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order) +static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order) { int i, s; |
