diff options
-rw-r--r-- | MAINTAINERS | 18 | ||||
-rw-r--r-- | drivers/acpi/Kconfig | 2 |
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 | |||
216 | M: len.brown@intel.com | 216 | M: len.brown@intel.com |
217 | M: lenb@kernel.org | 217 | M: lenb@kernel.org |
218 | L: linux-acpi@vger.kernel.org | 218 | L: linux-acpi@vger.kernel.org |
219 | W: http://acpi.sourceforge.net/ | 219 | W: http://www.lesswatts.org/projects/acpi/ |
220 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git | 220 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git |
221 | S: Supported | 221 | S: Supported |
222 | 222 | ||
@@ -235,8 +235,8 @@ W: http://acpi.sourceforge.net/ | |||
235 | S: Supported | 235 | S: Supported |
236 | 236 | ||
237 | ACPI FAN DRIVER | 237 | ACPI FAN DRIVER |
238 | P: Konstantin A. Karasyov | 238 | P: Len Brown |
239 | M: konstantin.a.karasyov@intel.com | 239 | M: len.brown@intel.com |
240 | L: linux-acpi@vger.kernel.org | 240 | L: linux-acpi@vger.kernel.org |
241 | W: http://acpi.sourceforge.net/ | 241 | W: http://acpi.sourceforge.net/ |
242 | S: Supported | 242 | S: Supported |
@@ -248,15 +248,15 @@ L: pcihpd-discuss@lists.sourceforge.net | |||
248 | S: Supported | 248 | S: Supported |
249 | 249 | ||
250 | ACPI THERMAL DRIVER | 250 | ACPI THERMAL DRIVER |
251 | P: Konstantin A. Karasyov | 251 | P: Len Brown |
252 | M: konstantin.a.karasyov@intel.com | 252 | M: len.brown@intel.com |
253 | L: linux-acpi@vger.kernel.org | 253 | L: linux-acpi@vger.kernel.org |
254 | W: http://acpi.sourceforge.net/ | 254 | W: http://acpi.sourceforge.net/ |
255 | S: Supported | 255 | S: Supported |
256 | 256 | ||
257 | ACPI VIDEO DRIVER | 257 | ACPI VIDEO DRIVER |
258 | P: Luming Yu | 258 | P: Rui Zhang |
259 | M: luming.yu@intel.com | 259 | M: rui.zhang@intel.com |
260 | L: linux-acpi@vger.kernel.org | 260 | L: linux-acpi@vger.kernel.org |
261 | W: http://acpi.sourceforge.net/ | 261 | W: http://acpi.sourceforge.net/ |
262 | S: Supported | 262 | S: Supported |
@@ -3472,12 +3472,14 @@ L: linux-pm@lists.linux-foundation.org | |||
3472 | S: Supported | 3472 | S: Supported |
3473 | 3473 | ||
3474 | SUSPEND TO RAM: | 3474 | SUSPEND TO RAM: |
3475 | P: Len Brown | ||
3476 | M: len.brown@intel.com | ||
3475 | P: Pavel Machek | 3477 | P: Pavel Machek |
3476 | M: pavel@suse.cz | 3478 | M: pavel@suse.cz |
3477 | P: Rafael J. Wysocki | 3479 | P: Rafael J. Wysocki |
3478 | M: rjw@sisk.pl | 3480 | M: rjw@sisk.pl |
3479 | L: linux-pm@lists.linux-foundation.org | 3481 | L: linux-pm@lists.linux-foundation.org |
3480 | S: Maintained | 3482 | S: Supported |
3481 | 3483 | ||
3482 | SONIC NETWORK DRIVER | 3484 | SONIC NETWORK DRIVER |
3483 | P: Thomas Bogendoerfer | 3485 | P: 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 | ||
5 | menuconfig ACPI | 5 | menuconfig 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 |