diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 18:33:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 18:33:42 +0200 |
| commit | 00ebb6382b8d9c7c15b5f8ad230670d8161d38dd (patch) | |
| tree | 23591394b83776953aaf0b382d4c7b09e0ca1e34 /Documentation/devices.txt | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff) | |
| parent | mmc: add new sdhci-pxa driver for Marvell SoCs (diff) | |
| download | linux-00ebb6382b8d9c7c15b5f8ad230670d8161d38dd.tar.xz linux-00ebb6382b8d9c7c15b5f8ad230670d8161d38dd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
mmc: add new sdhci-pxa driver for Marvell SoCs
mmc: make number of mmcblk minors configurable
mmc_spi: Recover from CRC errors for r/w operation over SPI.
mmc: sdhci-pltfm: add -pltfm driver for imx35/51
mmc: sdhci-of-esdhc: factor out common stuff
mmc: sdhci_pltfm: pass more data on custom init call
mmc: sdhci: introduce get_ro private write-protect hook
mmc: sdhci-pltfm: move .h file into appropriate subdir
mmc: sdhci-pltfm: Add structure for host-specific data
mmc: fix cb710 kconfig dependency warning
mmc: cb710: remove debugging printk (info duplicated from mmc-core)
mmc: cb710: clear irq handler on init() error path
mmc: cb710: remove unnecessary msleep()
mmc: cb710: implement get_cd() callback
mmc: cb710: partially demystify clock selection
mmc: add a file to debugfs for changing host clock at runtime
mmc: sdhci: allow for eMMC 74 clock generation by controller
mmc: sdhci: highspeed: check for mmc as well as sd cards
mmc: sdhci: Add Moorestown device support
mmc: sdhci: Intel Medfield support
...
Diffstat (limited to 'Documentation/devices.txt')
| -rw-r--r-- | Documentation/devices.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index c58abf1ccc71..170cc1e7e135 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt @@ -2520,6 +2520,12 @@ Your cooperation is appreciated. 8 = /dev/mmcblk1 Second SD/MMC card ... + The start of next SD/MMC card can be configured with + CONFIG_MMC_BLOCK_MINORS, or overridden at boot/modprobe + time using the mmcblk.perdev_minors option. That would + bump the offset between each card to be the configured + value instead of the default 8. + 179 char CCube DVXChip-based PCI products 0 = /dev/dvxirq0 First DVX device 1 = /dev/dvxirq1 Second DVX device |