diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/infiniband/hw/qib/qib_user_sdma.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_user_sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_user_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c index 66208bcd7c1..82442085cbe 100644 --- a/drivers/infiniband/hw/qib/qib_user_sdma.c +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c | |||
| @@ -239,7 +239,7 @@ static int qib_user_sdma_num_pages(const struct iovec *iov) | |||
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | /* | 241 | /* |
| 242 | * Truncate length to page boundry. | 242 | * Truncate length to page boundary. |
| 243 | */ | 243 | */ |
| 244 | static int qib_user_sdma_page_length(unsigned long addr, unsigned long len) | 244 | static int qib_user_sdma_page_length(unsigned long addr, unsigned long len) |
| 245 | { | 245 | { |