diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-05-30 10:36:45 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-05-30 10:36:45 -0400 |
| commit | 41b22f9d76e6d223a4a87f37483d1add39b364f6 (patch) | |
| tree | 8ef1164a36425623d44efca7017da1bcab06714d | |
| parent | 6ddada4248b7f654b0e0fc765d194c707cd459a8 (diff) | |
| download | kernel-41b22f9d76e6d223a4a87f37483d1add39b364f6.tar.gz kernel-41b22f9d76e6d223a4a87f37483d1add39b364f6.tar.xz kernel-41b22f9d76e6d223a4a87f37483d1add39b364f6.zip | |
second pass of new kconfig options
| -rw-r--r-- | config-arm | 6 | ||||
| -rw-r--r-- | config-ia64-generic | 1 | ||||
| -rw-r--r-- | config-powerpc-generic | 10 | ||||
| -rw-r--r-- | config-powerpc64 | 4 | ||||
| -rw-r--r-- | config-s390x | 3 |
5 files changed, 24 insertions, 0 deletions
diff --git a/config-arm b/config-arm index 3095ce40e..dd6f90ad6 100644 --- a/config-arm +++ b/config-arm @@ -141,3 +141,9 @@ CONFIG_SPARSE_IRQ=y CONFIG_FTMAC100=m CONFIG_HWSPINLOCK_OMAP=m + +CONFIG_USE_OF=y +CONFIG_PROC_DEVICETREE=y +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_MMC_SDHCI_OF=m diff --git a/config-ia64-generic b/config-ia64-generic index 8f08564a9..704c704aa 100644 --- a/config-ia64-generic +++ b/config-ia64-generic @@ -141,6 +141,7 @@ CONFIG_ACPI_HED=m CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_IPMI=m CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_SENSORS_ACPI_POWER=m CONFIG_PM=y CONFIG_HOTPLUG_PCI=y diff --git a/config-powerpc-generic b/config-powerpc-generic index 05b9a4a3c..e47c31588 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -326,6 +326,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m # CONFIG_PMIC_ADP5520 is not set # CONFIG_MFD_88PM8607 is not set # CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_WL1273_CORE is not set # CONFIG_XPS_USB_HCD_XILINX is not set # CONFIG_MMC_SDHCI_OF_ESDHC is not set @@ -345,3 +346,12 @@ CONFIG_I2C_MPC=m # CONFIG_IMA is not set # CONFIG_TCG_TPM is not set + +CONFIG_RFKILL_GPIO=m + +CONFIG_CRYPTO_DEV_FSL_CAAM=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048 +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m diff --git a/config-powerpc64 b/config-powerpc64 index 2946a0686..8866a5320 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -184,3 +184,7 @@ CONFIG_CMM=y # CONFIG_SPARSEMEM_VMEMMAP is not set CONFIG_PSERIES_ENERGY=m + +CONFIG_PPC_ICSWX=y +CONFIG_IO_EVENT_IRQ=y +CONFIG_HW_RANDOM_AMD=m diff --git a/config-s390x b/config-s390x index 55e205fdd..da9db13c1 100644 --- a/config-s390x +++ b/config-s390x @@ -235,3 +235,6 @@ CONFIG_SCHED_BOOK=y CONFIG_STRICT_DEVMEM=y # CONFIG_WARN_DYNAMIC_STACK is not set + +CONFIG_JUMP_LABEL=y +CONFIG_CRYPTO_GHASH_S390=m |