summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-08 21:34:51 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-08 21:34:51 +0200
commit19ce7f3f31103d7a5b0e93ba9de3ebb4b9d66701 (patch)
tree025bfbd59c2df27c2301163280a8dedd7b5400a6 /drivers/acpi
parentMerge branches 'pm-wakeup' and 'pm-domains' (diff)
parentACPI: Update the ACPI spec information in Kconfig (diff)
downloadlinux-19ce7f3f31103d7a5b0e93ba9de3ebb4b9d66701.tar.xz
linux-19ce7f3f31103d7a5b0e93ba9de3ebb4b9d66701.zip
Merge branch 'acpi-config'
* acpi-config: ACPI: Update the ACPI spec information in Kconfig
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c205653e9644..ab686b310100 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -31,10 +31,14 @@ menuconfig ACPI
ACPI CA, see:
<http://acpica.org/>
- ACPI is an open industry specification co-developed by
- Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba.
+ ACPI is an open industry specification originally co-developed by
+ Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
+ it is developed by the ACPI Specification Working Group (ASWG) under
+ the UEFI Forum and any UEFI member can join the ASWG and contribute
+ to the ACPI specification.
The specification is available at:
<http://www.acpi.info>
+ <http://www.uefi.org/acpi/specs>
if ACPI