x86: partly revert cabf775
				
					
				
			The subtarget cleanups made in cabf775 "x86: Refresh subtargets kernel config"
removed some important symbol disable statements, so revert the changes to the
subtarget configs for now.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
			
			
This commit is contained in:
		| @@ -30,10 +30,12 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y | |||||||
| # CONFIG_ACPI_SBS is not set | # CONFIG_ACPI_SBS is not set | ||||||
| CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y | CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y | ||||||
| CONFIG_ACPI_THERMAL=y | CONFIG_ACPI_THERMAL=y | ||||||
|  | # CONFIG_ACPI_VIDEO is not set | ||||||
| # CONFIG_ACPI_WMI is not set | # CONFIG_ACPI_WMI is not set | ||||||
| CONFIG_ALIX=y | CONFIG_ALIX=y | ||||||
| CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y | CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y | ||||||
| # CONFIG_ATA_PIIX is not set | # CONFIG_ATA_PIIX is not set | ||||||
|  | # CONFIG_BACKLIGHT_APPLE is not set | ||||||
| CONFIG_CS5535_CLOCK_EVENT_SRC=y | CONFIG_CS5535_CLOCK_EVENT_SRC=y | ||||||
| CONFIG_CS5535_MFGPT=y | CONFIG_CS5535_MFGPT=y | ||||||
| CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 | CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 | ||||||
| @@ -131,3 +133,4 @@ CONFIG_X86_PM_TIMER=y | |||||||
| # CONFIG_X86_PPRO_FENCE is not set | # CONFIG_X86_PPRO_FENCE is not set | ||||||
| CONFIG_X86_REBOOTFIXUPS=y | CONFIG_X86_REBOOTFIXUPS=y | ||||||
| CONFIG_X86_TSC=y | CONFIG_X86_TSC=y | ||||||
|  | # CONFIG_X86_X2APIC is not set | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| # CONFIG_3C515 is not set | # CONFIG_3C515 is not set | ||||||
| CONFIG_ACPI=y | CONFIG_ACPI=y | ||||||
| CONFIG_ACPI_AC=y | CONFIG_ACPI_AC=y | ||||||
|  | # CONFIG_ACPI_ALS is not set | ||||||
| CONFIG_ACPI_BATTERY=y | CONFIG_ACPI_BATTERY=y | ||||||
| CONFIG_ACPI_BUTTON=y | CONFIG_ACPI_BUTTON=y | ||||||
| # CONFIG_ACPI_CMPC is not set | # CONFIG_ACPI_CMPC is not set | ||||||
| @@ -38,11 +39,13 @@ CONFIG_AGP_INTEL=y | |||||||
| # CONFIG_AGP_SIS is not set | # CONFIG_AGP_SIS is not set | ||||||
| # CONFIG_AGP_SWORKS is not set | # CONFIG_AGP_SWORKS is not set | ||||||
| # CONFIG_AGP_VIA is not set | # CONFIG_AGP_VIA is not set | ||||||
|  | # CONFIG_APPLE_GMUX is not set | ||||||
| CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y | CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y | ||||||
| # CONFIG_BACKLIGHT_APPLE is not set | # CONFIG_BACKLIGHT_APPLE is not set | ||||||
| CONFIG_BACKLIGHT_CLASS_DEVICE=y | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||||||
| CONFIG_BACKLIGHT_GENERIC=y | CONFIG_BACKLIGHT_GENERIC=y | ||||||
| CONFIG_BACKLIGHT_LCD_SUPPORT=y | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||||||
|  | # CONFIG_BACKLIGHT_SAHARA is not set | ||||||
| CONFIG_BLK_DEV_SR=y | CONFIG_BLK_DEV_SR=y | ||||||
| # CONFIG_BLK_DEV_SR_VENDOR is not set | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||||||
| CONFIG_CLKDEV_LOOKUP=y | CONFIG_CLKDEV_LOOKUP=y | ||||||
| @@ -108,6 +111,7 @@ CONFIG_FONT_SUPPORT=y | |||||||
| CONFIG_FRAMEBUFFER_CONSOLE=y | CONFIG_FRAMEBUFFER_CONSOLE=y | ||||||
| CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||||||
| # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||||||
|  | # CONFIG_FUJITSU_LAPTOP is not set | ||||||
| CONFIG_HAVE_ACPI_APEI=y | CONFIG_HAVE_ACPI_APEI=y | ||||||
| CONFIG_HAVE_ACPI_APEI_NMI=y | CONFIG_HAVE_ACPI_APEI_NMI=y | ||||||
| CONFIG_HAVE_CLK=y | CONFIG_HAVE_CLK=y | ||||||
| @@ -160,8 +164,10 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y | |||||||
| CONFIG_MOUSE_PS2_TRACKPOINT=y | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||||||
| # CONFIG_MOUSE_SERIAL is not set | # CONFIG_MOUSE_SERIAL is not set | ||||||
| # CONFIG_MOUSE_VSXXXAA is not set | # CONFIG_MOUSE_VSXXXAA is not set | ||||||
|  | CONFIG_NLS=y | ||||||
| CONFIG_NOHIGHMEM=y | CONFIG_NOHIGHMEM=y | ||||||
| CONFIG_NO_HZ=y | CONFIG_NO_HZ=y | ||||||
|  | # CONFIG_PANASONIC_LAPTOP is not set | ||||||
| CONFIG_PATA_AMD=y | CONFIG_PATA_AMD=y | ||||||
| CONFIG_PATA_ATIIXP=y | CONFIG_PATA_ATIIXP=y | ||||||
| CONFIG_PATA_LEGACY=y | CONFIG_PATA_LEGACY=y | ||||||
| @@ -172,6 +178,7 @@ CONFIG_PATA_SC1200=y | |||||||
| CONFIG_PATA_VIA=y | CONFIG_PATA_VIA=y | ||||||
| CONFIG_PCIEAER=y | CONFIG_PCIEAER=y | ||||||
| CONFIG_PCIEPORTBUS=y | CONFIG_PCIEPORTBUS=y | ||||||
|  | CONFIG_PCI_LABEL=y | ||||||
| CONFIG_PCI_MMCONFIG=y | CONFIG_PCI_MMCONFIG=y | ||||||
| # CONFIG_PCWATCHDOG is not set | # CONFIG_PCWATCHDOG is not set | ||||||
| # CONFIG_PMIC_OPREGION is not set | # CONFIG_PMIC_OPREGION is not set | ||||||
| @@ -200,6 +207,7 @@ CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | |||||||
| # CONFIG_WDT is not set | # CONFIG_WDT is not set | ||||||
| CONFIG_X86_ACPI_CPUFREQ=y | CONFIG_X86_ACPI_CPUFREQ=y | ||||||
| # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | ||||||
|  | # CONFIG_X86_POWERNOW_K8 is not set | ||||||
| # CONFIG_X86_AMD_FREQ_SENSITIVITY is not set | # CONFIG_X86_AMD_FREQ_SENSITIVITY is not set | ||||||
| # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | ||||||
| # CONFIG_X86_E_POWERSAVER is not set | # CONFIG_X86_E_POWERSAVER is not set | ||||||
| @@ -208,4 +216,4 @@ CONFIG_X86_ACPI_CPUFREQ=y | |||||||
| # CONFIG_X86_PAE is not set | # CONFIG_X86_PAE is not set | ||||||
| # CONFIG_X86_PCC_CPUFREQ is not set | # CONFIG_X86_PCC_CPUFREQ is not set | ||||||
| CONFIG_X86_PM_TIMER=y | CONFIG_X86_PM_TIMER=y | ||||||
| # CONFIG_X86_POWERNOW_K8 is not set | # CONFIG_X86_X2APIC is not set | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jo-Philipp Wich
					Jo-Philipp Wich