- i686 parts of config

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 363f9e4cdf6133495c9a37be09395d2a06bb2ce9..dee28bfdac0c1431eb08ae483e7d4e3647dab178 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -8967,6 +8967,7 @@ USB_G_WEBCAM all=m
 #-
 #- *** FILE: drivers/usb/gadget/udc/Kconfig ***
 #-
+USB_FUSB300 x86=m
 USB_FOTG210_UDC all=m
 USB_GR_UDC all=m
 USB_R8A66597 all=m

diff --git a/kernel-x86.config b/kernel-x86.config
index a9635625ef6b5f0611a5997513acd2350005bf4a..4ae30cb810a4869405d419979eacd1b930db7924 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -28,6 +28,7 @@ PARAVIRT_DEBUG x86=n
 PARAVIRT_SPINLOCKS x86=n
 #- file arch/x86/xen/Kconfig goes here
 KVM_GUEST x86=y
+PVH x86=y
 PARAVIRT_TIME_ACCOUNTING x86=y
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
@@ -82,7 +83,6 @@ MTRR_SANITIZER x86=y
 MTRR_SANITIZER_ENABLE_DEFAULT x86=0
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
-X86_INTEL_MPX x86=y
 X86_INTEL_MEMORY_PROTECTION_KEYS all=y
 X86_INTEL_TSX_MODE_OFF x86=y
 X86_INTEL_TSX_MODE_ON x86=n
@@ -140,8 +140,8 @@ X86_X32 x86_64=y
 #-
 #- *** FILE: arch/x86/Kconfig.cpu ***
 #-
-M486 i386=n i486=y
 M486SX x86=n
+M486 i386=n i486=y
 M586 i386=n i586=y
 M586TSC i386=n
 M586MMX i386=n
@@ -281,6 +281,7 @@ VIDEO_IVTV_DEPRECATED_IOCTLS all=n
 VMD all=m
 WW_MUTEX_SELFTEST all=m
 X86_DECODER_SELFTEST x86=n
+X86_INTEL_MPX x86=y
 #* do we care ?
 X86_PPRO_FENCE i386=y pentium3= pentium4= athlon=
 X86_PTDUMP x86=n