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/mmc/card/mmc_test.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/mmc/card/mmc_test.c')
| -rw-r--r-- | drivers/mmc/card/mmc_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index f5cedeccad4..abc1a63bcc5 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c | |||
| @@ -292,7 +292,7 @@ static void mmc_test_free_mem(struct mmc_test_mem *mem) | |||
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | /* | 294 | /* |
| 295 | * Allocate a lot of memory, preferrably max_sz but at least min_sz. In case | 295 | * Allocate a lot of memory, preferably max_sz but at least min_sz. In case |
| 296 | * there isn't much memory do not exceed 1/16th total lowmem pages. Also do | 296 | * there isn't much memory do not exceed 1/16th total lowmem pages. Also do |
| 297 | * not exceed a maximum number of segments and try not to make segments much | 297 | * not exceed a maximum number of segments and try not to make segments much |
| 298 | * bigger than maximum segment size. | 298 | * bigger than maximum segment size. |