aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS18
-rw-r--r--drivers/acpi/Kconfig2
2 files changed, 11 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 231bda28c428..4a26f832b4b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,7 +216,7 @@ P: Len Brown
216M: len.brown@intel.com 216M: len.brown@intel.com
217M: lenb@kernel.org 217M: lenb@kernel.org
218L: linux-acpi@vger.kernel.org 218L: linux-acpi@vger.kernel.org
219W: http://acpi.sourceforge.net/ 219W: http://www.lesswatts.org/projects/acpi/
220T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git 220T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
221S: Supported 221S: Supported
222 222
@@ -235,8 +235,8 @@ W: http://acpi.sourceforge.net/
235S: Supported 235S: Supported
236 236
237ACPI FAN DRIVER 237ACPI FAN DRIVER
238P: Konstantin A. Karasyov 238P: Len Brown
239M: konstantin.a.karasyov@intel.com 239M: len.brown@intel.com
240L: linux-acpi@vger.kernel.org 240L: linux-acpi@vger.kernel.org
241W: http://acpi.sourceforge.net/ 241W: http://acpi.sourceforge.net/
242S: Supported 242S: Supported
@@ -248,15 +248,15 @@ L: pcihpd-discuss@lists.sourceforge.net
248S: Supported 248S: Supported
249 249
250ACPI THERMAL DRIVER 250ACPI THERMAL DRIVER
251P: Konstantin A. Karasyov 251P: Len Brown
252M: konstantin.a.karasyov@intel.com 252M: len.brown@intel.com
253L: linux-acpi@vger.kernel.org 253L: linux-acpi@vger.kernel.org
254W: http://acpi.sourceforge.net/ 254W: http://acpi.sourceforge.net/
255S: Supported 255S: Supported
256 256
257ACPI VIDEO DRIVER 257ACPI VIDEO DRIVER
258P: Luming Yu 258P: Rui Zhang
259M: luming.yu@intel.com 259M: rui.zhang@intel.com
260L: linux-acpi@vger.kernel.org 260L: linux-acpi@vger.kernel.org
261W: http://acpi.sourceforge.net/ 261W: http://acpi.sourceforge.net/
262S: Supported 262S: Supported
@@ -3472,12 +3472,14 @@ L: linux-pm@lists.linux-foundation.org
3472S: Supported 3472S: Supported
3473 3473
3474SUSPEND TO RAM: 3474SUSPEND TO RAM:
3475P: Len Brown
3476M: len.brown@intel.com
3475P: Pavel Machek 3477P: Pavel Machek
3476M: pavel@suse.cz 3478M: pavel@suse.cz
3477P: Rafael J. Wysocki 3479P: Rafael J. Wysocki
3478M: rjw@sisk.pl 3480M: rjw@sisk.pl
3479L: linux-pm@lists.linux-foundation.org 3481L: linux-pm@lists.linux-foundation.org
3480S: Maintained 3482S: Supported
3481 3483
3482SONIC NETWORK DRIVER 3484SONIC NETWORK DRIVER
3483P: Thomas Bogendoerfer 3485P: Thomas Bogendoerfer
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index ecd87d7aa9f6..da3a08fa9e4f 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4 4
5menuconfig ACPI 5menuconfig ACPI
6 bool "ACPI Support (Advanced Configuration and Power Interface) Support" 6 bool "ACPI (Advanced Configuration and Power Interface) Support"
7 depends on !X86_NUMAQ 7 depends on !X86_NUMAQ
8 depends on !X86_VISWS 8 depends on !X86_VISWS
9 depends on !IA64_HP_SIM 9 depends on !IA64_HP_SIM