From cbc77023770ed66b323938c8a066a783a1c3156a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 21 Sep 2017 23:48:38 +0100 Subject: [PATCH] Clean up kconfig using kconfigeditor2 This is just fixing up file headings; ukleinek handled all the renamed symbols. --- debian/config/amd64/config | 6 +++- debian/config/arm64/config | 32 +++++++++++++++---- debian/config/armhf/config | 36 ++++++++++++++------- debian/config/config | 64 +++++++++++++++++++++++++++----------- 4 files changed, 101 insertions(+), 37 deletions(-) diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 73630c392..17fbdf546 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -189,7 +189,6 @@ CONFIG_FB_MATROX_MAVEN=m ## ## file: init/Kconfig ## -CONFIG_RCU_FANOUT=64 CONFIG_KALLSYMS_ALL=y ## @@ -197,6 +196,11 @@ CONFIG_KALLSYMS_ALL=y ## CONFIG_LIVEPATCH=y +## +## file: kernel/rcu/Kconfig +## +CONFIG_RCU_FANOUT=64 + ## ## file: lib/Kconfig.debug ## diff --git a/debian/config/arm64/config b/debian/config/arm64/config index 08f9f657f..bf51d415d 100644 --- a/debian/config/arm64/config +++ b/debian/config/arm64/config @@ -557,16 +557,36 @@ CONFIG_PCIE_ROCKCHIP=y ## ## file: drivers/phy/Kconfig ## -CONFIG_PHY_HI6220_USB=m +CONFIG_PHY_XGENE=m + +## +## file: drivers/phy/allwinner/Kconfig +## CONFIG_PHY_SUN4I_USB=m + +## +## file: drivers/phy/amlogic/Kconfig +## +CONFIG_PHY_MESON8B_USB2=m + +## +## file: drivers/phy/hisilicon/Kconfig +## +CONFIG_PHY_HI6220_USB=m + +## +## file: drivers/phy/qualcomm/Kconfig +## CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_QCOM_IPQ806X_SATA=m -CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_EMMC=m -CONFIG_PHY_ROCKCHIP_PCIE=m -CONFIG_PHY_XGENE=m CONFIG_PHY_QCOM_UFS=m -CONFIG_PHY_MESON8B_USB2=m + +## +## file: drivers/phy/rockchip/Kconfig +## +CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +CONFIG_PHY_ROCKCHIP_PCIE=m ## ## file: drivers/phy/tegra/Kconfig diff --git a/debian/config/armhf/config b/debian/config/armhf/config index c9647f854..df658d299 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -648,8 +648,8 @@ CONFIG_CAN_SUN4I=m ## ## file: drivers/net/dsa/Kconfig ## -CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_BCM_SF2=m +CONFIG_NET_DSA_MV88E6060=m ## ## file: drivers/net/dsa/b53/Kconfig @@ -851,28 +851,40 @@ CONFIG_PCI_TEGRA=y CONFIG_PCI_HOST_GENERIC=y ## -## file: drivers/phy/Kconfig +## file: drivers/phy/allwinner/Kconfig ## -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_OMAP_CONTROL_PHY=m -CONFIG_OMAP_USB2=m -CONFIG_TI_PIPE3=y -CONFIG_TWL4030_USB=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m -CONFIG_PHY_EXYNOS5250_SATA=m CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN9I_USB=m + +## +## file: drivers/phy/rockchip/Kconfig +## +CONFIG_PHY_ROCKCHIP_DP=m +CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_ROCKCHIP_USB=m + +## +## file: drivers/phy/samsung/Kconfig +## +CONFIG_PHY_EXYNOS_DP_VIDEO=m +CONFIG_PHY_EXYNOS_MIPI_VIDEO=m CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_EXYNOS5_USBDRD=m -CONFIG_PHY_ROCKCHIP_USB=m -CONFIG_PHY_ROCKCHIP_EMMC=m -CONFIG_PHY_ROCKCHIP_DP=m +CONFIG_PHY_EXYNOS5250_SATA=m ## ## file: drivers/phy/tegra/Kconfig ## CONFIG_PHY_TEGRA_XUSB=m +## +## file: drivers/phy/ti/Kconfig +## +CONFIG_OMAP_CONTROL_PHY=m +CONFIG_OMAP_USB2=m +CONFIG_TI_PIPE3=y +CONFIG_TWL4030_USB=m + ## ## file: drivers/pinctrl/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 74d49227e..986ff87d9 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1177,6 +1177,7 @@ CONFIG_BH1780=m # CONFIG_CM3323 is not set # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set +# CONFIG_SENSORS_ISL29028 is not set # CONFIG_ISL29125 is not set CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m @@ -2903,8 +2904,8 @@ CONFIG_CAN_8DEV_USB=m ## ## file: drivers/net/dsa/Kconfig ## -# CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_MV88E6060 is not set ## ## file: drivers/net/dsa/mv88e6xxx/Kconfig @@ -3986,15 +3987,31 @@ CONFIG_YENTA_TOSHIBA=y ## file: drivers/phy/Kconfig ## # CONFIG_GENERIC_PHY is not set -# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set + +## +## file: drivers/phy/broadcom/Kconfig +## +# CONFIG_BCM_KONA_USB2_PHY is not set + +## +## file: drivers/phy/marvell/Kconfig +## # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set + +## +## file: drivers/phy/samsung/Kconfig +## +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set + +## +## file: drivers/phy/ti/Kconfig +## # CONFIG_OMAP_CONTROL_PHY is not set # CONFIG_OMAP_USB2 is not set # CONFIG_TWL4030_USB is not set -# CONFIG_PHY_EXYNOS_DP_VIDEO is not set -# CONFIG_BCM_KONA_USB2_PHY is not set -# CONFIG_PHY_SAMSUNG_USB2 is not set ## ## file: drivers/pinctrl/Kconfig @@ -4529,7 +4546,6 @@ CONFIG_STAGING=y ## ## file: drivers/staging/iio/light/Kconfig ## -# CONFIG_SENSORS_ISL29028 is not set # CONFIG_TSL2x7x is not set ## @@ -5839,9 +5855,6 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_RCU_EXPERT is not set -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FAST_NO_HZ=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 @@ -5982,6 +5995,22 @@ CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set ## end choice +## +## file: kernel/rcu/Kconfig +## +# CONFIG_RCU_EXPERT is not set +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FAST_NO_HZ=y + +## +## file: kernel/rcu/Kconfig.debug +## +# CONFIG_RCU_PERF_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set + ## ## file: kernel/time/Kconfig ## @@ -6108,11 +6137,6 @@ CONFIG_DEBUG_LIST=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set @@ -7177,15 +7201,11 @@ CONFIG_SND=m ## ## file: sound/core/Kconfig ## -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_TIMER=y -# CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 CONFIG_SND_SUPPORT_OLD_API=y @@ -7194,6 +7214,14 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +## +## file: sound/core/seq/Kconfig +## +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y + ## ## file: sound/drivers/Kconfig ##