diff options
| author | Colin Cross <ccross@android.com> | 2010-10-06 16:31:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-06 16:32:09 -0700 |
| commit | 98959c85632cde43fc83ba1b709f767fc3b8a4ee (patch) | |
| tree | be7912bc7cd8c2aab86922da933439ff951ab602 /drivers/mmc/core/Kconfig | |
| parent | 5c4a97667fdf6705d6c9f9e4b42dd7deb4da6978 (diff) | |
| parent | df5ac72e83df9fd8d735d40d5be464d4b66d6074 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/input/touchscreen/Kconfig
Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
Diffstat (limited to 'drivers/mmc/core/Kconfig')
| -rw-r--r-- | drivers/mmc/core/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig index bb22ffd76ef8..0eba6658233a 100644 --- a/drivers/mmc/core/Kconfig +++ b/drivers/mmc/core/Kconfig @@ -16,3 +16,20 @@ config MMC_UNSAFE_RESUME This option sets a default which can be overridden by the module parameter "removable=0" or "removable=1". + +config MMC_EMBEDDED_SDIO + boolean "MMC embedded SDIO device support (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + If you say Y here, support will be added for embedded SDIO + devices which do not contain the necessary enumeration + support in hardware to be properly detected. + +config MMC_PARANOID_SD_INIT + bool "Enable paranoid SD card initialization (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + If you say Y here, the MMC layer will be extra paranoid + about re-trying SD init requests. This can be a useful + work-around for buggy controllers and hardware. Enable + if you are experiencing issues with SD detection. |