diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-09-13 08:41:54 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-09-13 08:41:54 +0100 |
| commit | a0a9c7d7205b06947752fd1ab34502c3aa5ba50f (patch) | |
| tree | a2f8181a4fc95f104587dc0eeb0f288b489fff17 /baseconfig | |
| parent | b4668f245f4965cc754efce0321172fcb4067895 (diff) | |
| download | kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.gz kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.tar.xz kernel-a0a9c7d7205b06947752fd1ab34502c3aa5ba50f.zip | |
initial ARM fixes and bits for 4.13 stable rebase
Diffstat (limited to 'baseconfig')
| -rw-r--r-- | baseconfig/CONFIG_MMC_SDHCI_OF | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_PWRSEQ_SD8787 | 2 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_MMC | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_MMC_QCOM_DML | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_PWRSEQ_EMMC | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_PWRSEQ_SIMPLE | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI (renamed from baseconfig/arm/CONFIG_DRM_SUN4I_HDMI) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC | 1 | ||||
| -rw-r--r-- | baseconfig/powerpc/CONFIG_MMC_SDHCI_OF | 1 | ||||
| -rw-r--r-- | baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK (renamed from baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK) | 0 | ||||
| -rw-r--r-- | baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF | 1 | ||||
| -rw-r--r-- | baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF | 1 |
17 files changed, 8 insertions, 8 deletions
diff --git a/baseconfig/CONFIG_MMC_SDHCI_OF b/baseconfig/CONFIG_MMC_SDHCI_OF deleted file mode 100644 index 2e588649a..000000000 --- a/baseconfig/CONFIG_MMC_SDHCI_OF +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MMC_SDHCI_OF is not set diff --git a/baseconfig/CONFIG_PWRSEQ_SD8787 b/baseconfig/CONFIG_PWRSEQ_SD8787 index 243dba034..820984327 100644 --- a/baseconfig/CONFIG_PWRSEQ_SD8787 +++ b/baseconfig/CONFIG_PWRSEQ_SD8787 @@ -1 +1 @@ -# CONFIG_PWRSEQ_SD8787 is not set +CONFIG_PWRSEQ_SD8787=m diff --git a/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE new file mode 100644 index 000000000..5c70cb19a --- /dev/null +++ b/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE @@ -0,0 +1 @@ +CONFIG_CRYPTO_GHASH_ARM_CE=m diff --git a/baseconfig/arm/CONFIG_MMC b/baseconfig/arm/CONFIG_MMC new file mode 100644 index 000000000..7c2be178c --- /dev/null +++ b/baseconfig/arm/CONFIG_MMC @@ -0,0 +1 @@ +CONFIG_MMC=y diff --git a/baseconfig/arm/CONFIG_MMC_QCOM_DML b/baseconfig/arm/CONFIG_MMC_QCOM_DML deleted file mode 100644 index 11f7e7eba..000000000 --- a/baseconfig/arm/CONFIG_MMC_QCOM_DML +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MMC_QCOM_DML is not set diff --git a/baseconfig/arm/CONFIG_PWRSEQ_EMMC b/baseconfig/arm/CONFIG_PWRSEQ_EMMC new file mode 100644 index 000000000..29e883d93 --- /dev/null +++ b/baseconfig/arm/CONFIG_PWRSEQ_EMMC @@ -0,0 +1 @@ +CONFIG_PWRSEQ_EMMC=y diff --git a/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE b/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE new file mode 100644 index 000000000..7c8ad9b8a --- /dev/null +++ b/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE @@ -0,0 +1 @@ +CONFIG_PWRSEQ_SIMPLE=y diff --git a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML new file mode 100644 index 000000000..059d0d4f2 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML @@ -0,0 +1 @@ +CONFIG_MMC_QCOM_DML=m diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE b/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE deleted file mode 100644 index e2ffa82ef..000000000 --- a/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_GHASH_ARM_CE is not set diff --git a/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI index cda1f60f8..cda1f60f8 100644 --- a/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI +++ b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set b/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set deleted file mode 100644 index d161874fe..000000000 --- a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXYNOS5420_MCPM not set diff --git a/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML b/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML new file mode 100644 index 000000000..059d0d4f2 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML @@ -0,0 +1 @@ +CONFIG_MMC_QCOM_DML=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC new file mode 100644 index 000000000..40e2f68cb --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC @@ -0,0 +1 @@ +CONFIG_MMC_SDHCI_OF_ESDHC=m diff --git a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF b/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF deleted file mode 100644 index d2e2790aa..000000000 --- a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MMC_SDHCI_OF=m diff --git a/baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK b/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK index 74be3ced5..74be3ced5 100644 --- a/baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK +++ b/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK diff --git a/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF b/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF deleted file mode 100644 index 2e588649a..000000000 --- a/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MMC_SDHCI_OF is not set diff --git a/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF b/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF deleted file mode 100644 index 2e588649a..000000000 --- a/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MMC_SDHCI_OF is not set |