summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config3
-rw-r--r--config/defines2
-rw-r--r--config/kernelarch-x86/config207
3 files changed, 3 insertions, 209 deletions
diff --git a/config/config b/config/config
index 455c9c2..538e692 100644
--- a/config/config
+++ b/config/config
@@ -2809,9 +2809,10 @@ CONFIG_PM_STD_PARTITION=""
## file: kernel/Kconfig.preempt
##
## choice: Preemption Model
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_RT=y
## end choice
##
diff --git a/config/defines b/config/defines
index b78f391..07c0e24 100644
--- a/config/defines
+++ b/config/defines
@@ -1,5 +1,5 @@
[abi]
-abiname: trunk
+abiname: 1
[base]
arches:
diff --git a/config/kernelarch-x86/config b/config/kernelarch-x86/config
index c9ca7be..75b333e 100644
--- a/config/kernelarch-x86/config
+++ b/config/kernelarch-x86/config
@@ -213,213 +213,6 @@ CONFIG_ACPI_ASUS=m
CONFIG_ACPI_TOSHIBA=m
##
-## file: drivers/staging/Kconfig
-##
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-
-##
-## file: drivers/staging/agnx/Kconfig
-##
-# CONFIG_AGNX is not set
-
-##
-## file: drivers/staging/altpciechdma/Kconfig
-##
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-
-##
-## file: drivers/staging/android/Kconfig
-##
-# CONFIG_ANDROID is not set
-# CONFIG_ANDROID_BINDER_IPC is not set
-# CONFIG_ANDROID_LOGGER is not set
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-
-##
-## file: drivers/staging/asus_oled/Kconfig
-##
-# CONFIG_ASUS_OLED is not set
-
-##
-## file: drivers/staging/at76_usb/Kconfig
-##
-# CONFIG_USB_ATMEL is not set
-
-##
-## file: drivers/staging/b3dfg/Kconfig
-##
-# CONFIG_B3DFG is not set
-
-##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
-##
-## file: drivers/staging/cpc-usb/Kconfig
-##
-# CONFIG_USB_CPC is not set
-
-##
-## file: drivers/staging/dst/Kconfig
-##
-# CONFIG_DST is not set
-
-##
-## file: drivers/staging/echo/Kconfig
-##
-# CONFIG_ECHO is not set
-
-##
-## file: drivers/staging/epl/Kconfig
-##
-# CONFIG_EPL is not set
-
-##
-## file: drivers/staging/et131x/Kconfig
-##
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-
-##
-## file: drivers/staging/frontier/Kconfig
-##
-# CONFIG_TRANZPORT is not set
-
-##
-## file: drivers/staging/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
-
-##
-## file: drivers/staging/heci/Kconfig
-##
-# CONFIG_HECI is not set
-
-##
-## file: drivers/staging/line6/Kconfig
-##
-# CONFIG_LINE6_USB is not set
-
-##
-## file: drivers/staging/me4000/Kconfig
-##
-# CONFIG_ME4000 is not set
-
-##
-## file: drivers/staging/meilhaus/Kconfig
-##
-# CONFIG_MEILHAUS is not set
-
-##
-## file: drivers/staging/mimio/Kconfig
-##
-# CONFIG_INPUT_MIMIO is not set
-
-##
-## file: drivers/staging/otus/Kconfig
-##
-# CONFIG_OTUS is not set
-
-##
-## file: drivers/staging/p9auth/Kconfig
-##
-# CONFIG_PLAN9AUTH is not set
-
-##
-## file: drivers/staging/panel/Kconfig
-##
-# CONFIG_PANEL is not set
-
-##
-## file: drivers/staging/pata_rdc/Kconfig
-##
-# CONFIG_RDC_17F3101X is not set
-
-##
-## file: drivers/staging/phison/Kconfig
-##
-# CONFIG_IDE_PHISON is not set
-
-##
-## file: drivers/staging/poch/Kconfig
-##
-# CONFIG_POCH is not set
-
-##
-## file: drivers/staging/pohmelfs/Kconfig
-##
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-
-##
-## file: drivers/staging/rt2860/Kconfig
-##
-CONFIG_RT2860=m
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-CONFIG_RT2870=m
-
-##
-## file: drivers/staging/rt3070/Kconfig
-##
-CONFIG_RT3070=m
-
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-CONFIG_RTL8187SE=m
-
-##
-## file: drivers/staging/serqt_usb2/Kconfig
-##
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-
-##
-## file: drivers/staging/slicoss/Kconfig
-##
-# CONFIG_SLICOSS is not set
-
-##
-## file: drivers/staging/stlc45xx/Kconfig
-##
-# CONFIG_STLC45XX is not set
-
-##
-## file: drivers/staging/sxg/Kconfig
-##
-# CONFIG_SXG is not set
-
-##
-## file: drivers/staging/udlfb/Kconfig
-##
-# CONFIG_FB_UDL is not set
-
-##
-## file: drivers/staging/usbip/Kconfig
-##
-# CONFIG_USB_IP_COMMON is not set
-
-##
-## file: drivers/staging/winbond/Kconfig
-##
-# CONFIG_W35UND is not set
-
-##
-## file: drivers/staging/wlan-ng/Kconfig
-##
-CONFIG_PRISM2_USB=m
-
-##
## file: drivers/video/Kconfig
##
CONFIG_XEN_FBDEV_FRONTEND=y