diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/acpi/Kconfig | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (diff) | |
Pull misc-for-upstream into release branch
Conflicts:
drivers/usb/misc/appledisplay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 20eacc2c9e0e..2d21fed402b5 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -13,6 +13,7 @@ config ACPI | |||
| 13 | depends on IA64 || X86 | 13 | depends on IA64 || X86 |
| 14 | depends on PCI | 14 | depends on PCI |
| 15 | depends on PM | 15 | depends on PM |
| 16 | select PNP | ||
| 16 | default y | 17 | default y |
| 17 | ---help--- | 18 | ---help--- |
| 18 | Advanced Configuration and Power Interface (ACPI) support for | 19 | Advanced Configuration and Power Interface (ACPI) support for |