diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/infiniband/hw/ipath/ipath_user_sdma.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_user_sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_user_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c index be78f6643c06..f5cb13b21445 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c +++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c | |||
| @@ -236,7 +236,7 @@ static int ipath_user_sdma_num_pages(const struct iovec *iov) | |||
| 236 | return 1 + ((epage - spage) >> PAGE_SHIFT); | 236 | return 1 + ((epage - spage) >> PAGE_SHIFT); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | /* truncate length to page boundry */ | 239 | /* truncate length to page boundary */ |
| 240 | static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len) | 240 | static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len) |
| 241 | { | 241 | { |
| 242 | const unsigned long offset = addr & ~PAGE_MASK; | 242 | const unsigned long offset = addr & ~PAGE_MASK; |