r298 - x86/trunk/linux

justin at linuxfromscratch.org justin at linuxfromscratch.org
Wed Jul 6 12:32:56 PDT 2005


Author: justin
Date: 2005-07-06 13:32:55 -0600 (Wed, 06 Jul 2005)
New Revision: 298

Modified:
   x86/trunk/linux/config
Log:
Merged r278 to trunk.

Modified: x86/trunk/linux/config
===================================================================
--- x86/trunk/linux/config	2005-07-06 19:20:07 UTC (rev 297)
+++ x86/trunk/linux/config	2005-07-06 19:32:55 UTC (rev 298)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11.12
-# Sun Jun 19 10:42:33 2005
+# Fri Jun 24 16:10:52 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -143,8 +143,7 @@
 #
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
+# CONFIG_SOFTWARE_SUSPEND is not set
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
@@ -177,7 +176,14 @@
 #
 # APM (Advanced Power Management) BIOS Support
 #
-# CONFIG_APM is not set
+CONFIG_APM=y
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_RTC_IS_GMT is not set
+# CONFIG_APM_ALLOW_INTS is not set
+# CONFIG_APM_REAL_MODE_POWER_OFF is not set
 
 #
 # CPU Frequency scaling
@@ -232,8 +238,8 @@
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_MISC=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
 
 #
 # Device Drivers
@@ -1185,8 +1191,7 @@
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_RIVA is not set
-CONFIG_FB_I810=m
-# CONFIG_FB_I810_GTF is not set
+# CONFIG_FB_I810 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON_OLD is not set
@@ -1449,7 +1454,6 @@
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
 
 #
 # XFS support
@@ -1525,18 +1529,17 @@
 #
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y




More information about the livecd mailing list