diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /config-x86-32-generic | |
parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r-- | config-x86-32-generic | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic index 6adcfb524..865fb9004 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -2,15 +2,9 @@ # CONFIG_X86_32_NON_STANDARD is not set -# CONFIG_X86_ELAN is not set # CONFIG_X86_GOLDFISH is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set CONFIG_X86_BIGSMP=y -# CONFIG_X86_VISWS is not set # CONFIG_X86_RDC321X is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -88,8 +82,6 @@ CONFIG_X86_LONGRUN=y # CONFIG_X86_E_POWERSAVER is not set CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y - # CONFIG_4KSTACKS is not set @@ -112,7 +104,6 @@ CONFIG_SCx200_ACB=m CONFIG_PC8736x_GPIO=m # CONFIG_NSC_GPIO is not set -CONFIG_CS5535_GPIO=m CONFIG_GPIO_SCH=m CONFIG_HW_RANDOM_GEODE=m @@ -142,7 +133,6 @@ CONFIG_LBDAF=y CONFIG_OLPC=y -CONFIG_OLPC_OPENFIRMWARE=y CONFIG_BATTERY_OLPC=y CONFIG_MOUSE_PS2_OLPC=y CONFIG_OLPC_XO1_PM=y @@ -159,10 +149,8 @@ CONFIG_RCU_FANOUT=32 # CONFIG_X86_ANCIENT_MCE is not set -# CONFIG_X86_MRST is not set CONFIG_I2C_PXA=m -# CONFIG_GPIO_LANGWELL is not set # CONFIG_INTEL_TXT is not set @@ -178,17 +166,18 @@ CONFIG_XO1_RFKILL=m 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_PROC_DEVICETREE=y CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m # CONFIG_MMC_SDHCI_OF is not set # CONFIG_X86_INTEL_MID is not set +# CONFIG_X86_INTEL_QUARK is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_SYSCON is not set @@ -208,8 +197,9 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_EDAC_SBRIDGE is not set -# CONFIG_X86_WANT_INTEL_MID is not set -# CONFIG_OF_SELFTEST is not set +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +# CONFIG_OF_OVERLAY is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set @@ -218,17 +208,15 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_MDIO_BUS_MUX_GPIO is not set # CONFIG_MDIO_BUS_MUX_MMIOREG is not set # CONFIG_GPIO_SODAVILLE is not set -# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_74XX_MMIO is not set # CONFIG_BACKLIGHT_OT200 is not set -# CONFIG_RTC_DRV_SNVS is not set -# CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_OF_DISPLAY_TIMING is not set -# CONFIG_OF_VIDEOMODE is not set # CONFIG_MLX5_INFINIBAND is not set # CONFIG_PINCTRL_SINGLE is not set -# CONFIG_PINCTRL_CAPRI is not set -# CONFIG_PINCTRL_MSM8X74 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_KEYBOARD_BCM is not set |