diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
| commit | 6a4b170c54289f427645019c52d1b9c871a6661e (patch) | |
| tree | e129355a1e07a6ee7f24a3df1fdb59906f733bf4 /arch/ia64/configs/sn2_defconfig | |
| parent | eccdfcd6f8265300380fa14a83aeb14e69830323 (diff) | |
| parent | 64e47488c913ac704d465a6af86a26786d1412a5 (diff) | |
| download | linux-6a4b170c54289f427645019c52d1b9c871a6661e.tar.gz | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'arch/ia64/configs/sn2_defconfig')
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index dccf35c60b94..1ca6e6e11b42 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -130,19 +130,12 @@ CONFIG_ACPI=y # # ACPI (Advanced Configuration and Power Interface) Support # -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_INTERPRETER=y # CONFIG_ACPI_BUTTON is not set -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_HOTKEY=m # CONFIG_ACPI_FAN is not set # CONFIG_ACPI_PROCESSOR is not set CONFIG_ACPI_NUMA=y -CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_BUS=y CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y # CONFIG_ACPI_CONTAINER is not set |