From 86cbdc4d6fccaaad30e46a204ad2652d7ef70a12 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 16 Dec 2018 18:07:59 +0100 Subject: [PATCH] Clean up kconfig order --- debian/config/arm64/config | 32 ++++++++++++++--------------- debian/config/armhf/config | 10 ++++----- debian/config/config | 2 +- debian/config/kernelarch-x86/config | 5 ++--- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/debian/config/arm64/config b/debian/config/arm64/config index 65c8e828c..d33a9ee56 100644 --- a/debian/config/arm64/config +++ b/debian/config/arm64/config @@ -68,8 +68,8 @@ CONFIG_ARCH_XGENE=y ## file: drivers/acpi/Kconfig ## CONFIG_ACPI=y -CONFIG_ACPI_IPMI=m CONFIG_ACPI_SPCR_TABLE=y +CONFIG_ACPI_IPMI=m CONFIG_ACPI_NUMA=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_HED=y @@ -712,6 +712,16 @@ CONFIG_PCIE_QCOM=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIE_KIRIN=y +## +## file: drivers/pci/hotplug/Kconfig +## +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=y + ## ## file: drivers/pci/pcie/Kconfig ## @@ -728,16 +738,6 @@ CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_XGENE_PMU=y -## -## file: drivers/pci/hotplug/Kconfig -## -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=y - ## ## file: drivers/phy/Kconfig ## @@ -909,11 +909,6 @@ CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_HISI_SAS=m CONFIG_SCSI_HISI_SAS_PCI=m -## -## file: drivers/staging/vc04_services/bcm2835-audio/Kconfig -## -CONFIG_SND_BCM2835=m - ## ## file: drivers/soc/bcm/Kconfig ## @@ -965,6 +960,11 @@ CONFIG_SPMI_MSM_PMIC_ARB=y ## CONFIG_RTL8723BS=m +## +## file: drivers/staging/vc04_services/bcm2835-audio/Kconfig +## +CONFIG_SND_BCM2835=m + ## ## file: drivers/tee/Kconfig ## diff --git a/debian/config/armhf/config b/debian/config/armhf/config index f5b621482..48d26fea8 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -1063,11 +1063,6 @@ CONFIG_RTC_DRV_SNVS=y CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_AM53C974=m -## -## file: drivers/staging/vc04_services/bcm2835-audio/Kconfig -## -CONFIG_SND_BCM2835=m - ## ## file: drivers/soc/bcm/Kconfig ## @@ -1106,6 +1101,11 @@ CONFIG_SPI_SUN6I=m CONFIG_SPI_TEGRA114=m CONFIG_SPI_TEGRA20_SFLASH=m +## +## file: drivers/staging/vc04_services/bcm2835-audio/Kconfig +## +CONFIG_SND_BCM2835=m + ## ## file: drivers/thermal/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 9d48ddef7..4fbcffe42 100644 --- a/debian/config/config +++ b/debian/config/config @@ -7267,7 +7267,6 @@ CONFIG_NET_KEY_MIGRATE=y ## ## file: security/Kconfig ## -CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y CONFIG_SECURITY=y @@ -7331,6 +7330,7 @@ CONFIG_KEYS=y # CONFIG_BIG_KEYS is not set # CONFIG_TRUSTED_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set +CONFIG_KEY_DH_OPERATIONS=y ## ## file: security/loadpin/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index c23972da0..48bfcb93c 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -28,7 +28,6 @@ CONFIG_KVM_GUEST=y CONFIG_HPET_TIMER=y CONFIG_DMI=y CONFIG_GART_IOMMU=y -CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -454,9 +453,9 @@ CONFIG_EDAC_I5000=m CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_EDAC_SKX=m +CONFIG_EDAC_PND2=m CONFIG_EDAC_AMD8131=m CONFIG_EDAC_AMD8111=m -CONFIG_EDAC_PND2=m ## ## file: drivers/extcon/Kconfig @@ -504,6 +503,7 @@ CONFIG_GPIO_ML_IOH=m ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m +CONFIG_DRM_DP_CEC=y CONFIG_DRM_RADEON=m CONFIG_DRM_AMDGPU=m CONFIG_DRM_TDFX=m @@ -511,7 +511,6 @@ CONFIG_DRM_R128=m # CONFIG_DRM_I810 is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m -CONFIG_DRM_DP_CEC=y ## ## file: drivers/gpu/drm/amd/acp/Kconfig