summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-12-15 15:35:40 -0800
committerLaura Abbott <labbott@fedoraproject.org>2016-12-15 15:35:40 -0800
commit68eebd5c343394f45361e9e3732cfbb8a3e32e32 (patch)
tree5c2ba83f864fd69c4e7620c6983b8814b11a919d /config-x86-32-generic
parent5de569a890be505e0ec46d2b1c9691f0405a17c6 (diff)
downloadkernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.tar.gz
kernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.tar.xz
kernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.zip
Linux v4.9 rebase
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic21
1 files changed, 5 insertions, 16 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index ddc9f3047..7cf7362e5 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -22,6 +22,7 @@ CONFIG_M686=y
# CONFIG_MWINCHIP3D is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
+# CONFIG_SCx200 is not set
# CONFIG_STA2X11 is not set
CONFIG_NR_CPUS=32
@@ -56,8 +57,6 @@ CONFIG_FB_SSD1307=m
# CONFIG_PCI_GOMMCONFIG is not set
CONFIG_PCI_GOANY=y
-CONFIG_IBM_ASM=m
-
#
# APM (Advanced Power Management) BIOS Support
#
@@ -68,7 +67,6 @@ CONFIG_APM_CPU_IDLE=y
# CONFIG_APM_DISPLAY_BLANK is not set
# CONFIG_APM_ALLOW_INTS is not set
-
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
# CONFIG_X86_GX_SUSPMOD is not set
@@ -82,7 +80,6 @@ CONFIG_X86_LONGRUN=y
# e_powersaver is dangerous
# CONFIG_X86_E_POWERSAVER is not set
-
# CONFIG_4KSTACKS is not set
CONFIG_PCI_DIRECT=y
@@ -98,7 +95,7 @@ CONFIG_I2C_ALI1563=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
-CONFIG_SCx200_ACB=m
+# CONFIG_SCx200_ACB is not set
# CONFIG_X86_REBOOTFIXUPS is not set
@@ -118,19 +115,16 @@ CONFIG_PHYSICAL_START=0x400000
# CONFIG_KEXEC_JUMP is not set
CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_VIDEO_CAFE_CCIC=m
-
CONFIG_MTD_NAND_CAFE=m
CONFIG_LBDAF=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-
CONFIG_OLPC=y
CONFIG_BATTERY_OLPC=y
CONFIG_MOUSE_PS2_OLPC=y
@@ -138,17 +132,17 @@ CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO15_SCI=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
-# CONFIG_ALIX is not set
-# staging
+CONFIG_CRYPTO_DEV_GEODE=m
# CONFIG_FB_OLPC_DCON is not set
+# CONFIG_ALIX is not set
+
# CONFIG_SPARSE_IRQ is not set
CONFIG_RCU_FANOUT=32
# CONFIG_X86_ANCIENT_MCE is not set
-
CONFIG_I2C_PXA=m
# CONFIG_INTEL_TXT is not set
@@ -167,8 +161,6 @@ CONFIG_X86_32_IRIS=m
CONFIG_POWER_RESET_GPIO=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
-
-
CONFIG_MTD_OF_PARTS=y
CONFIG_MTD_PHYSMAP_OF=m
CONFIG_SERIAL_OF_PLATFORM=m
@@ -206,10 +198,7 @@ CONFIG_OF=y
# CONFIG_MLX5_INFINIBAND is not set
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_QCOM is not set
# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_KEYBOARD_BCM is not set