From 88d5cdd0e7588eba47ebf6ce6558d2dc7002eabc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 13 Nov 2016 03:23:23 +0000 Subject: [PATCH] Update kconfig for 4.9 - Various ancient SCSI drivers were removed; delete config for them - r8723au was replaced by rtl8xxxu; enable the latter instead and for all architectures - netfilter config symbols were renamed; enable the new ones - Various other config symbols are obsolete; delete them - Various other config symbols moved to different Kconfig files --- debian/changelog | 3 + debian/config/alpha/config | 10 +- debian/config/arm64/config | 14 +-- debian/config/armhf/config | 27 +++--- debian/config/config | 106 ++++++++++----------- debian/config/hppa/config | 5 - debian/config/i386/config | 9 -- debian/config/i386/config.686 | 2 +- debian/config/kernelarch-mips/config | 2 +- debian/config/kernelarch-mips/config.malta | 2 +- debian/config/kernelarch-powerpc/config | 4 +- debian/config/kernelarch-sparc/config | 2 +- debian/config/kernelarch-x86/config | 18 +--- debian/config/m68k/config | 2 +- 14 files changed, 82 insertions(+), 124 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7fbe31ee..8766b73ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ linux (4.9~rc3-1~exp2) UNRELEASED; urgency=medium * linux-perf: Exclude perf-read-vdso* from shared library dependency check (fixes FTBFS on sparc64) * [x86] kexec: add -fno-PIE + * wireless: Enable RTL8XXXU as module, replacement for R8723AU + * netfilter: Enable NFT_SET_RBTREE and NFT_SET_HASH as modules, + renamed from NFT_RBTREE and NFT_HASH -- Aurelien Jarno Sat, 05 Nov 2016 23:17:01 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index c2b31f073..144e307c2 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -185,9 +185,9 @@ CONFIG_EISA_NAMES=y ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m +CONFIG_DRM_RADEON=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m @@ -756,11 +756,9 @@ CONFIG_RTC_DRV_ALPHA=y ## ## file: drivers/scsi/Kconfig ## -CONFIG_SCSI_IN2000=m CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_DTC3280=m CONFIG_SCSI_EATA=m CONFIG_SCSI_EATA_TAGGED_QUEUE=y CONFIG_SCSI_EATA_LINKED_COMMANDS=y @@ -782,18 +780,12 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_IPR=m CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y -CONFIG_SCSI_PAS16=m CONFIG_SCSI_QLOGIC_FAS=m CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_SIM710=m CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_AM53C974=m -CONFIG_SCSI_T128=m -CONFIG_SCSI_U14_34F=m -CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y -CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y -CONFIG_SCSI_U14_34F_MAX_TAGS=8 CONFIG_SCSI_DEBUG=m ## diff --git a/debian/config/arm64/config b/debian/config/arm64/config index 507a1ac80..4fdc7bb82 100644 --- a/debian/config/arm64/config +++ b/debian/config/arm64/config @@ -465,12 +465,6 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y ## CONFIG_CHROME_PLATFORMS=y -## -## file: drivers/power/Kconfig -## -CONFIG_BATTERY_BQ27XXX=m -CONFIG_CHARGER_QCOM_SMBB=m - ## ## file: drivers/power/reset/Kconfig ## @@ -481,6 +475,12 @@ CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y +## +## file: drivers/power/supply/Kconfig +## +CONFIG_BATTERY_BQ27XXX=m +CONFIG_CHARGER_QCOM_SMBB=m + ## ## file: drivers/pwm/Kconfig ## @@ -608,9 +608,9 @@ CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_EM is not set -CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_OF_PLATFORM=y ## diff --git a/debian/config/armhf/config b/debian/config/armhf/config index 3f39a374a..ca923ae26 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -876,19 +876,6 @@ CONFIG_PINCTRL_PALMAS=y ## CONFIG_PINCTRL_WM8850=y -## -## file: drivers/power/Kconfig -## -CONFIG_BATTERY_SBS=m -CONFIG_BATTERY_BQ27XXX=m -CONFIG_BATTERY_TWL4030_MADC=m -CONFIG_BATTERY_RX51=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_TWL4030=m -CONFIG_CHARGER_GPIO=m -CONFIG_CHARGER_BQ2415X=m -CONFIG_AXP20X_POWER=m - ## ## file: drivers/power/avs/Kconfig ## @@ -906,6 +893,19 @@ CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y +## +## file: drivers/power/supply/Kconfig +## +CONFIG_BATTERY_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_TWL4030_MADC=m +CONFIG_BATTERY_RX51=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_AXP20X_POWER=m + ## ## file: drivers/pwm/Kconfig ## @@ -955,7 +955,6 @@ CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_RK808=y -CONFIG_RTC_DRV_ISL12057=y CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_TWL4030=y diff --git a/debian/config/config b/debian/config/config index 8a1bd33bd..1b042bcb7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -562,9 +562,9 @@ CONFIG_GPIO_VIPERBOARD=m ## CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_DRM_VGEM=m ## ## file: drivers/gpu/drm/ast/Kconfig @@ -1398,7 +1398,6 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m # CONFIG_TOUCHSCREEN_EGALAX is not set -# CONFIG_TOUCHSCREEN_FT6236 is not set CONFIG_TOUCHSCREEN_FUJITSU=m # CONFIG_TOUCHSCREEN_GOODIX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set @@ -2446,8 +2445,6 @@ CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m -# CONFIG_BMP085_I2C is not set -# CONFIG_BMP085_SPI is not set # CONFIG_USB_SWITCH_FSA9480 is not set # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_SRAM is not set @@ -3145,11 +3142,11 @@ CONFIG_YAM=m ## file: drivers/net/ieee802154/Kconfig ## CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_ADF7242=m CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_ATUSB=m -CONFIG_IEEE802154_CC2520=m CONFIG_IEEE802154_MRF24J40=m +CONFIG_IEEE802154_CC2520=m +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m ## ## file: drivers/net/irda/Kconfig @@ -3174,38 +3171,38 @@ CONFIG_MCS_FIR=m ## file: drivers/net/phy/Kconfig ## CONFIG_PHYLIB=m +# CONFIG_MDIO_BCM_UNIMAC is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set +# CONFIG_MDIO_GPIO is not set +# CONFIG_MDIO_OCTEON is not set +CONFIG_AMD_PHY=m CONFIG_AQUANTIA_PHY=m CONFIG_AT803X_PHY=m -CONFIG_AMD_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_TERANETICS_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m # CONFIG_BCM63XX_PHY is not set # CONFIG_BCM7XXX_PHY is not set CONFIG_BCM87XX_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MICREL_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_DAVICOM_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m -CONFIG_MICROCHIP_PHY=m #. Must only be enabled for specific flavours # CONFIG_FIXED_PHY is not set -# CONFIG_MDIO_BITBANG is not set -# CONFIG_MDIO_GPIO is not set -# CONFIG_MDIO_OCTEON is not set -# CONFIG_MDIO_BUS_MUX_GPIO is not set -# CONFIG_MDIO_BUS_MUX_MMIOREG is not set -# CONFIG_MDIO_BCM_UNIMAC is not set +CONFIG_ICPLUS_PHY=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m # CONFIG_MICREL_KS8995MA is not set ## @@ -3555,6 +3552,12 @@ CONFIG_RT2800USB_RT55XX=y CONFIG_RTL8180=m CONFIG_RTL8187=m +## +## file: drivers/net/wireless/realtek/rtl8xxxu/Kconfig +## +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set + ## ## file: drivers/net/wireless/realtek/rtlwifi/Kconfig ## @@ -3742,7 +3745,17 @@ CONFIG_SONY_LAPTOP=m # CONFIG_PNP_DEBUG_MESSAGES is not set ## -## file: drivers/power/Kconfig +## file: drivers/power/avs/Kconfig +## +# CONFIG_POWER_AVS is not set + +## +## file: drivers/power/reset/Kconfig +## +# CONFIG_POWER_RESET is not set + +## +## file: drivers/power/supply/Kconfig ## CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set @@ -3772,16 +3785,6 @@ CONFIG_CHARGER_PCF50633=m # CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_CHARGER_RT9455 is not set -## -## file: drivers/power/avs/Kconfig -## -# CONFIG_POWER_AVS is not set - -## -## file: drivers/power/reset/Kconfig -## -# CONFIG_POWER_RESET is not set - ## ## file: drivers/pps/Kconfig ## @@ -3848,7 +3851,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF8523 is not set # CONFIG_RTC_DRV_PCF85063 is not set @@ -3930,7 +3932,6 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_HPSA=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m CONFIG_SCSI_AHA1542=m @@ -4295,11 +4296,6 @@ CONFIG_88EU_AP_MODE=y ## CONFIG_R8712U=m -## -## file: drivers/staging/rtl8723au/Kconfig -## -# CONFIG_R8723AU is not set - ## ## file: drivers/staging/rts5208/Kconfig ## @@ -4481,6 +4477,7 @@ CONFIG_UIO_MF624=m ## CONFIG_USB_SUPPORT=y CONFIG_USB_LED_TRIG=y +# CONFIG_USB_ULPI_BUS is not set ## ## file: drivers/usb/atm/Kconfig @@ -4512,7 +4509,6 @@ CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_OTG_FSM is not set -# CONFIG_USB_ULPI_BUS is not set ## ## file: drivers/usb/dwc2/Kconfig @@ -4827,11 +4823,6 @@ CONFIG_FB_MB862XX_I2C=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set -## -## file: drivers/video/fbdev/exynos/Kconfig -## -# CONFIG_EXYNOS_VIDEO is not set - ## ## file: drivers/video/logo/Kconfig ## @@ -6119,7 +6110,6 @@ CONFIG_TCP_MD5SIG=y ## file: net/ipv4/netfilter/Kconfig ## CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NF_TABLES_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_DUP_IPV4=m @@ -6299,8 +6289,8 @@ CONFIG_NF_TABLES_NETDEV=m CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_CT=m -CONFIG_NFT_RBTREE=m -CONFIG_NFT_HASH=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m CONFIG_NFT_COUNTER=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -6310,6 +6300,7 @@ CONFIG_NFT_NAT=m CONFIG_NFT_QUEUE=m CONFIG_NFT_REJECT=m CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m @@ -6705,7 +6696,6 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set ## ## file: security/smack/Kconfig diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 44f0ca414..dafc02118 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -426,10 +426,8 @@ CONFIG_RTC_DRV_GENERIC=y ## ## file: drivers/scsi/Kconfig ## -# CONFIG_SCSI_IN2000 is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set @@ -449,14 +447,11 @@ CONFIG_SCSI_ZALON=m CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 CONFIG_SCSI_NCR53C8XX_SYNC=20 -# CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_SIM710 is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set ## ## file: drivers/scsi/megaraid/Kconfig.megaraid diff --git a/debian/config/i386/config b/debian/config/i386/config index 45b78dafd..736ab7206 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -356,22 +356,13 @@ CONFIG_PNPBIOS=y ## ## file: drivers/scsi/Kconfig ## -CONFIG_SCSI_IN2000=m -CONFIG_SCSI_DTC3280=m CONFIG_SCSI_EATA_PIO=m # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set # CONFIG_SCSI_INIA100 is not set CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_PAS16=m CONFIG_SCSI_QLOGIC_FAS=m CONFIG_SCSI_SYM53C416=m -CONFIG_SCSI_T128=m -CONFIG_SCSI_U14_34F=m -CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y -CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y -CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=m CONFIG_SCSI_NSP32=m ## diff --git a/debian/config/i386/config.686 b/debian/config/i386/config.686 index eccad2ea6..d3a811da5 100644 --- a/debian/config/i386/config.686 +++ b/debian/config/i386/config.686 @@ -63,7 +63,7 @@ CONFIG_XO1_RFKILL=m CONFIG_XO15_EBOOK=m ## -## file: drivers/power/Kconfig +## file: drivers/power/supply/Kconfig ## CONFIG_BATTERY_OLPC=m diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config index c2cfaeefc..78b9267b1 100644 --- a/debian/config/kernelarch-mips/config +++ b/debian/config/kernelarch-mips/config @@ -1,8 +1,8 @@ ## ## file: arch/mips/Kconfig ## -CONFIG_RANDOMIZE_BASE=y CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y CONFIG_KEXEC=y CONFIG_SECCOMP=y CONFIG_PCI=y diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta index 010b72f61..c079ae58f 100644 --- a/debian/config/kernelarch-mips/config.malta +++ b/debian/config/kernelarch-mips/config.malta @@ -60,9 +60,9 @@ CONFIG_IPMI_POWEROFF=m ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m +CONFIG_DRM_RADEON=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m CONFIG_DRM_MGA=m ## diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 7b709e53d..d78f46908 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -185,9 +185,9 @@ CONFIG_CPU_FREQ_PMAC=y ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m +CONFIG_DRM_RADEON=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m CONFIG_DRM_MGA=m # CONFIG_DRM_SIS is not set @@ -675,7 +675,7 @@ CONFIG_TCIC=m # CONFIG_PCMCIA_DEBUG is not set ## -## file: drivers/power/Kconfig +## file: drivers/power/supply/Kconfig ## CONFIG_BATTERY_PMU=m diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config index c6061525e..7f2e07da6 100644 --- a/debian/config/kernelarch-sparc/config +++ b/debian/config/kernelarch-sparc/config @@ -77,9 +77,9 @@ CONFIG_CRYPTO_DEV_NIAGARA2=m ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m +CONFIG_DRM_RADEON=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m CONFIG_DRM_MGA=m ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index d48ac63ec..6a8d2fcff 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -478,10 +478,10 @@ CONFIG_GPIO_ML_IOH=m ## file: drivers/gpu/drm/Kconfig ## CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_AMDGPU=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m # CONFIG_DRM_I810 is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m @@ -497,11 +497,6 @@ CONFIG_DRM_AMDGPU_USERPTR=y ## CONFIG_HSA_AMD=m -## -## file: drivers/gpu/drm/amd/powerplay/Kconfig -## -CONFIG_DRM_AMD_POWERPLAY=y - ## ## file: drivers/gpu/drm/ast/Kconfig ## @@ -1377,7 +1372,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_PNP=y ## -## file: drivers/power/Kconfig +## file: drivers/power/supply/Kconfig ## CONFIG_BATTERY_SBS=m @@ -1603,13 +1598,6 @@ CONFIG_RTL8192E=m ## CONFIG_RTL8192U=m -## -## file: drivers/staging/rtl8723au/Kconfig -## -CONFIG_R8723AU=m -CONFIG_8723AU_AP_MODE=y -CONFIG_8723AU_BT_COEXIST=y - ## ## file: drivers/staging/rts5208/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index b416341b7..6e53eb353 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -451,7 +451,7 @@ CONFIG_PARPORT_ATARI=m # CONFIG_PNP is not set ## -## file: drivers/power/Kconfig +## file: drivers/power/supply/Kconfig ## # CONFIG_POWER_SUPPLY is not set