diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
| commit | f4ae78d536e6dfaeb24c01b331fc38d950ed062b (patch) | |
| tree | 6930a78aa7cc4ee1829d50d3bcbaf0dbe9e2e905 /arch/i386/config.in | |
| parent | 66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff) | |
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index a2252d7af..6557d822d 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -225,7 +225,6 @@ if [ "$CONFIG_APM" != "n" ]; then 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 ' Ignore multiple suspend/resume cycles' CONFIG_APM_IGNORE_SUSPEND_BOUNCE bool ' RTC stores time in GMT' CONFIG_APM_RTC_IS_GMT bool ' Allow interrupts during APM BIOS calls' CONFIG_APM_ALLOW_INTS bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF |