Update of /cvsroot/devil-linux/build/scripts/config/linux-2.6
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4059/scripts/config/linux-2.6
Modified Files:
Tag: rel-1-2-patches
config_linux config_linux.486 config_pax
Log Message:
ported 2.6 changes from DL 1.3
Index: config_pax
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_pax,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- config_pax 24 Feb 2004 03:18:00 -0000 1.2
+++ config_pax 15 Jun 2004 02:59:44 -0000 1.2.2.1
@@ -9,3 +9,4 @@
CONFIG_PAX_NO_ACL_FLAGS=y
# CONFIG_PAX_HAVE_ACL_FLAGS is not set
# CONFIG_PAX_HOOK_ACL_FLAGS is not set
+CONFIG_PAX_NOVSYSCALL=n
Index: config_linux.486
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.486,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- config_linux.486 12 Jan 2004 02:57:59 -0000 1.1
+++ config_linux.486 15 Jun 2004 02:59:44 -0000 1.1.2.1
@@ -2,6 +2,7 @@
# Processor type and features
#
CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
@@ -17,11 +18,11 @@
# CONFIG_M686 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-# CONFIG_MELAN is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
@@ -43,7 +44,7 @@
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=y
CONFIG_X86_MCE_P4THERMAL=y
@@ -52,7 +53,4 @@
# CONFIG_MICROCODE is not set
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
-CONFIG_EDD=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_HAVE_DEC_LOCK=y
+
Index: config_linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- config_linux 13 Mar 2004 00:37:04 -0000 1.15
+++ config_linux 15 Jun 2004 02:59:44 -0000 1.15.2.1
@@ -12,23 +12,29 @@
CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
#
# General setup
#
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
[...1202 lines suppressed...]
-CONFIG_PNPBIOS_PROC_FS=n
-CONFIG_PNP_DEBUG=n
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=n
-CONFIG_8139_RXBUF_IDX=2
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_I8XX_TCO=m
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_FB_RADEON_OLD=n
-CONFIG_XFS_SECURITY=y
+CONFIG_X86_STD_RESOURCES=y
|