diff --git a/[refs] b/[refs] index 3fd4aefe1bc7..d65639b1b950 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 109ec8c396eae4d54e14be61719184ec36704d15 +refs/heads/master: 0462566b1e3129b2920b63b62a653b70a1bc36fa diff --git a/trunk/drivers/mmc/host/bfin_sdh.c b/trunk/drivers/mmc/host/bfin_sdh.c index a17dd7363ceb..56a10938b44a 100644 --- a/trunk/drivers/mmc/host/bfin_sdh.c +++ b/trunk/drivers/mmc/host/bfin_sdh.c @@ -462,7 +462,11 @@ static int __devinit sdh_probe(struct platform_device *pdev) } mmc->ops = &sdh_ops; +#if defined(CONFIG_BF54x) mmc->max_segs = 32; +#elif defined(CONFIG_BF51x) + mmc->max_segs = 1; +#endif mmc->max_seg_size = 1 << 16; mmc->max_blk_size = 1 << 11; mmc->max_blk_count = 1 << 11;