diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2010-09-10 01:33:59 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2010-10-23 21:11:11 +0800 |
commit | a36274e0184193e393fb82957925c3981a6b0477 (patch) | |
tree | e937d3932603f2c574e54a28b5cb1cf07029f9f1 /drivers/mmc/host/omap.c | |
parent | 7a5ea56abc493fd43fb8d5b2f55d18396ec048f1 (diff) | |
download | linux-a36274e0184193e393fb82957925c3981a6b0477.tar.gz linux-a36274e0184193e393fb82957925c3981a6b0477.tar.bz2 linux-a36274e0184193e393fb82957925c3981a6b0477.zip |
mmc: Remove distinction between hw and phys segments
We have deprecated the distinction between hardware and physical
segments in the block layer. Consolidate the two limits into one in
drivers/mmc/.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/omap.c')
-rw-r--r-- | drivers/mmc/host/omap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index d98ddcfac5e5..0c7e37f496ef 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -1335,8 +1335,7 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id) * NOTE max_seg_size assumption that small blocks aren't * normally used (except e.g. for reading SD registers). */ - mmc->max_phys_segs = 32; - mmc->max_hw_segs = 32; + mmc->max_segs = 32; mmc->max_blk_size = 2048; /* BLEN is 11 bits (+1) */ mmc->max_blk_count = 2048; /* NBLK is 11 bits (+1) */ mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |