diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /arch/i386/config.in | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index c8af53dea..81cd0241d 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -209,9 +209,10 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Power Management support' CONFIG_PM -dep_tristate ' ACPI support' CONFIG_ACPI $CONFIG_PM +bool ' ACPI support' CONFIG_ACPI $CONFIG_PM if [ "$CONFIG_ACPI" != "n" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + bool ' ACPI interpreter (EXPERIMENTAL)' CONFIG_ACPI_INTERPRETER bool ' Enter S1 for sleep (EXPERIMENTAL)' CONFIG_ACPI_S1_SLEEP fi fi @@ -230,6 +231,8 @@ fi endmenu +source drivers/mtd/Config.in + source drivers/parport/Config.in source drivers/pnp/Config.in |