From 4051568f2bfbab5e53a631d576bfd1c024ead05f Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 6 Aug 2014 14:33:47 +0000 Subject: [PATCH] debian/config: Remove known dead options, resurrect others svn path=/dists/trunk/linux/; revision=21690 --- debian/config/alpha/config | 9 ----- debian/config/armel/config.kirkwood | 35 ------------------- debian/config/armel/config.mv78xx0 | 7 ---- debian/config/armel/config.orion5x | 13 +------ debian/config/armel/config.versatile | 5 --- debian/config/armhf/config.armmp | 19 ++-------- debian/config/hppa/config | 5 --- debian/config/ia64/config | 5 --- .../config/kernelarch-mips/config.loongson-2e | 14 ++++---- .../config/kernelarch-mips/config.loongson-2f | 6 ---- .../config/kernelarch-mips/config.loongson-3 | 5 --- debian/config/kernelarch-powerpc/config | 5 --- debian/config/kernelarch-x86/config | 15 -------- debian/config/kernelarch-x86/config-arch-32 | 6 ---- debian/config/sh4/config.sh7751r | 5 --- debian/config/sh4/config.sh7785lcr | 5 --- 16 files changed, 11 insertions(+), 148 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index b706a84f7..4baee75a9 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1100,12 +1100,3 @@ CONFIG_SND_YMFPCI=m ## CONFIG_SND_HDA_INTEL=m -## -## file: unknown -## -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_MTD_DOCPROBE_55AA=y -CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 -CONFIG_MTD_DOCPROBE_ADVANCED=y -CONFIG_MTD_DOCPROBE_HIGH=y - diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 1796ace9b..1fd96d704 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -656,38 +656,3 @@ CONFIG_SND_KIRKWOOD_SOC=m CONFIG_SND_KIRKWOOD_SOC_OPENRD=m CONFIG_SND_KIRKWOOD_SOC_T5325=m -## -## file: unknown -## -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -#. This is replaced by CONFIG_MACH_DB88F628X_BP_DT but we don't use DT here yet -CONFIG_MACH_DB88F6281_BP=y -CONFIG_MACH_DLINK_KIRKWOOD_DT=y -CONFIG_MACH_DOCKSTAR=y -CONFIG_MACH_DOCKSTAR_DT=y -CONFIG_MACH_DREAMPLUG_DT=y -CONFIG_MACH_ESATA_SHEEVAPLUG=y -CONFIG_MACH_GOFLEXNET_DT=y -CONFIG_MACH_GURUPLUG=y -CONFIG_MACH_GURUPLUG_DT=y -CONFIG_MACH_IB62X0_DT=y -CONFIG_MACH_ICONNECT_DT=y -CONFIG_MACH_INETSPACE_V2=y -CONFIG_MACH_INETSPACE_V2_DT=y -CONFIG_MACH_IOMEGA_IX2_200_DT=y -CONFIG_MACH_KM_KIRKWOOD_DT=y -CONFIG_MACH_LSXL_DT=y -CONFIG_MACH_MPLCEC4_DT=y -CONFIG_MACH_MV88F6281GTW_GE=y -CONFIG_MACH_NETSPACE_LITE_V2_DT=y -CONFIG_MACH_NETSPACE_MAX_V2=y -CONFIG_MACH_NETSPACE_MAX_V2_DT=y -CONFIG_MACH_NETSPACE_MINI_V2_DT=y -CONFIG_MACH_NETSPACE_V2=y -CONFIG_MACH_NETSPACE_V2_DT=y -CONFIG_MACH_OPENBLOCKS_A6_DT=y -CONFIG_MACH_SHEEVAPLUG=y -CONFIG_MACH_TOPKICK_DT=y -CONFIG_MACH_TS219_DT=y -# CONFIG_MTD_ALAUDA is not set - diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 index f55cca58f..5cb3b8d02 100644 --- a/debian/config/armel/config.mv78xx0 +++ b/debian/config/armel/config.mv78xx0 @@ -547,10 +547,3 @@ CONFIG_AX25=m CONFIG_NETROM=m CONFIG_ROSE=m -## -## file: unknown -## -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -# CONFIG_MTD_ALAUDA is not set -CONFIG_MTD_BLKDEVS=y - diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index a113ced8c..fe82cb517 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -37,6 +37,7 @@ CONFIG_MACH_WRT350N_V2=y CONFIG_MACH_TS78XX=y CONFIG_MACH_MV2120=y CONFIG_MACH_NET2BIG=y +CONFIG_MACH_MSS2_DT=y CONFIG_MACH_WNR854T=y CONFIG_MACH_RD88F5181L_GE=y CONFIG_MACH_RD88F5181L_FXO=y @@ -560,15 +561,3 @@ CONFIG_AX25=m CONFIG_NETROM=m CONFIG_ROSE=m -## -## file: unknown -## -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_MACH_BIGDISK=y -CONFIG_MACH_D2NET=y -#. This is replaced by CONFIG_MACH_EDMINI_V2_DT but we don't use DT here yet -CONFIG_MACH_EDMINI_V2=y -CONFIG_MACH_MSS2=y -# CONFIG_MTD_ALAUDA is not set -CONFIG_MTD_BLKDEVS=y - diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 71af8c1f1..f4fbc942c 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -457,8 +457,3 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set -## -## file: unknown -## -CONFIG_VIDEO_OUTPUT_CONTROL=m - diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp index 33fdd6741..2e9343e1e 100644 --- a/debian/config/armhf/config.armmp +++ b/debian/config/armhf/config.armmp @@ -249,9 +249,9 @@ CONFIG_SERIO_AMBAKMI=m ## file: drivers/input/touchscreen/Kconfig ## CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_SUN4I=m ## ## file: drivers/iommu/Kconfig @@ -527,7 +527,9 @@ CONFIG_WLCORE_SDIO=m ## ## file: drivers/phy/Kconfig ## +CONFIG_OMAP_CONTROL_PHY=m CONFIG_OMAP_USB2=m +CONFIG_TI_PIPE3=m CONFIG_TWL4030_USB=m CONFIG_PHY_SUN4I_USB=m @@ -797,18 +799,3 @@ CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP_HDMI=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m -## -## file: unknown -## -CONFIG_AM335X_CONTROL_USB=m -CONFIG_DRM_IMX_IPUV3_CORE=m -CONFIG_MACH_EUKREA_CPUIMX51SD=y -CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y -CONFIG_MACH_MX51_BABBAGE=y -CONFIG_MXC_IRQ_PRIOR=y -CONFIG_OMAP_CONTROL_USB=m -CONFIG_OMAP_USB3=m -CONFIG_PANEL_ACX565AKM=y -CONFIG_PANEL_GENERIC_DPI=y -CONFIG_VIDEO_OUTPUT_CONTROL=y - diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 7b3b53041..7ba56b9ac 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -716,8 +716,3 @@ CONFIG_SND_HARMONY=m ## # CONFIG_SND_HDA_INTEL is not set -## -## file: unknown -## -CONFIG_USB_DEBUG=y - diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 4f32e87bf..996e16741 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -872,8 +872,3 @@ CONFIG_SND_YMFPCI=m ## CONFIG_SND_HDA_INTEL=m -## -## file: unknown -## -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y - diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e index b77a96b64..1f399d079 100644 --- a/debian/config/kernelarch-mips/config.loongson-2e +++ b/debian/config/kernelarch-mips/config.loongson-2e @@ -13,6 +13,13 @@ CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y +## +## file: arch/mips/loongson/Kconfig +## +## choice: Machine Type +CONFIG_LEMOTE_FULOONG2E=y +## end choice + ## ## file: drivers/ata/Kconfig ## @@ -116,10 +123,3 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FB=y CONFIG_FB_RADEON=y -## -## file: unknown -## -CONFIG_FB_SM7XX=y -CONFIG_LEMOTE_MACH2E=y -CONFIG_VIDEO_OUTPUT_CONTROL=y - diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f index fbf47d637..8d7dd1d90 100644 --- a/debian/config/kernelarch-mips/config.loongson-2f +++ b/debian/config/kernelarch-mips/config.loongson-2f @@ -127,9 +127,3 @@ CONFIG_FB_SIS=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y -## -## file: unknown -## -CONFIG_FB_SM7XX=y -CONFIG_VIDEO_OUTPUT_CONTROL=y - diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3 index d1bbd9230..3cdba55a4 100644 --- a/debian/config/kernelarch-mips/config.loongson-3 +++ b/debian/config/kernelarch-mips/config.loongson-3 @@ -117,8 +117,3 @@ CONFIG_PREEMPT=y ## CONFIG_SND_HDA_INTEL=m -## -## file: unknown -## -CONFIG_VIDEO_OUTPUT_CONTROL=y - diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 8da66d0fc..f9feecbd1 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -1012,8 +1012,3 @@ CONFIG_SND_HDA_INTEL=m CONFIG_SND_POWERMAC=m CONFIG_SND_POWERMAC_AUTO_DRC=y -## -## file: unknown -## -# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set - diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 44098f996..a2093f4eb 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1874,18 +1874,3 @@ CONFIG_SND_YMFPCI=m ## CONFIG_SND_HDA_INTEL=m -## -## file: unknown -## -# CONFIG_ACPI_PROCFS is not set -# CONFIG_ACPI_PROC_EVENT is not set -CONFIG_ASUS_OLED=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_MTD_DOCPROBE_ADDRESS=0 -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_R8187SE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -CONFIG_SND_HDA_I915=y -CONFIG_VIDEO_OUTPUT_CONTROL=m - diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index a37cd42dd..1fe657cc8 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -523,9 +523,3 @@ CONFIG_SND_MSND_CLASSIC=m ## CONFIG_SND_SIS7019=m -## -## file: unknown -## -CONFIG_ACPI_BLACKLIST_YEAR=0 -CONFIG_COMEDI_POC=m - diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r index 10164d176..c17f6812a 100644 --- a/debian/config/sh4/config.sh7751r +++ b/debian/config/sh4/config.sh7751r @@ -172,8 +172,3 @@ CONFIG_FB_SM501=y CONFIG_FLATMEM_MANUAL=y ## end choice -## -## file: unknown -## -CONFIG_MTD_BLKDEVS=y - diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr index 4d934ac03..c21ff08b9 100644 --- a/debian/config/sh4/config.sh7785lcr +++ b/debian/config/sh4/config.sh7785lcr @@ -227,8 +227,3 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_MIGRATION=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -## -## file: unknown -## -CONFIG_MTD_BLKDEVS=y -