diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
commit | f85bb96a52f47a016aa5b67a9eff0c7f19a5b64c (patch) | |
tree | 0618209975b2807c01b18d384ded4f8342abe3a9 /drivers/mmc/core/Kconfig | |
parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151112.0
Conflicting files:
Diffstat (limited to 'drivers/mmc/core/Kconfig')
-rw-r--r-- | drivers/mmc/core/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig index f771bc3496a4..0525054f4078 100644 --- a/drivers/mmc/core/Kconfig +++ b/drivers/mmc/core/Kconfig @@ -26,3 +26,11 @@ config MMC_PARANOID_SD_INIT 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. + +config PWRSEQ_EMMC + tristate "PwrSeq EMMC" + depends on OF + +config PWRSEQ_SIMPLE + tristate "PwrSeq Simple" + depends on OF |