git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
atmel-mci.c
diff --git
a/drivers/mmc/host/atmel-mci.c
b/drivers/mmc/host/atmel-mci.c
index
95ef864
..
301351a
100644
(file)
--- a/
drivers/mmc/host/atmel-mci.c
+++ b/
drivers/mmc/host/atmel-mci.c
@@
-1618,8
+1618,7
@@
static int __init atmci_init_slot(struct atmel_mci *host,
if (slot_data->bus_width >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA;
if (slot_data->bus_width >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA;
- mmc->max_hw_segs = 64;
- mmc->max_phys_segs = 64;
+ mmc->max_segs = 64;
mmc->max_req_size = 32768 * 512;
mmc->max_blk_size = 32768;
mmc->max_blk_count = 512;
mmc->max_req_size = 32768 * 512;
mmc->max_blk_size = 32768;
mmc->max_blk_count = 512;
@@
-1777,7
+1776,7
@@
static int __init atmci_probe(struct platform_device *pdev)
}
ret = -ENOMEM;
}
ret = -ENOMEM;
- host->regs = ioremap(regs->start, re
gs->end - regs->start + 1
);
+ host->regs = ioremap(regs->start, re
source_size(regs)
);
if (!host->regs)
goto err_ioremap;
if (!host->regs)
goto err_ioremap;