patch-2.3.26 linux/arch/i386/config.in

Next file: linux/arch/i386/defconfig
Previous file: linux/arch/arm/defconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.25/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -104,6 +104,11 @@
 bool 'System V IPC' CONFIG_SYSVIPC
 bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
 bool 'Sysctl support' CONFIG_SYSCTL
+if [ "$CONFIG_PROC_FS" = "y" ]; then
+   choice 'Kernel core (/proc/kcore) format' \
+	"ELF		CONFIG_KCORE_ELF	\
+	 A.OUT		CONFIG_KCORE_AOUT" ELF
+fi
 tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
 tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
@@ -116,7 +121,6 @@
    bool '  Enable PM at boot time' CONFIG_APM_DO_ENABLE
    bool '  Make CPU Idle calls when idle' CONFIG_APM_CPU_IDLE
    bool '  Enable console blanking using APM' CONFIG_APM_DISPLAY_BLANK
-   bool '  Power off on shutdown' CONFIG_APM_POWER_OFF
    bool '  Ignore multiple suspend' CONFIG_APM_IGNORE_MULTIPLE_SUSPEND
    bool '  Ignore multiple suspend/resume cycles' CONFIG_APM_IGNORE_SUSPEND_BOUNCE
    bool '  RTC stores time in GMT' CONFIG_APM_RTC_IS_GMT

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)