diff options
-rw-r--r-- | MAINTAINERS | 8 | ||||
-rw-r--r-- | drivers/platform/x86/Kconfig | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7d9d3745aab9..05a4f306f1a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -920,8 +920,7 @@ M: corentincj@iksaif.net | |||
920 | P: Karol Kozimor | 920 | P: Karol Kozimor |
921 | M: sziwan@users.sourceforge.net | 921 | M: sziwan@users.sourceforge.net |
922 | L: acpi4asus-user@lists.sourceforge.net | 922 | L: acpi4asus-user@lists.sourceforge.net |
923 | W: http://sourceforge.net/projects/acpi4asus | 923 | W: http://acpi4asus.sf.net |
924 | W: http://xf.iksaif.net/acpi4asus | ||
925 | S: Maintained | 924 | S: Maintained |
926 | F: arch/x86/kernel/acpi/boot.c | 925 | F: arch/x86/kernel/acpi/boot.c |
927 | F: drivers/platform/x86/asus_acpi.c | 926 | F: drivers/platform/x86/asus_acpi.c |
@@ -937,8 +936,7 @@ ASUS LAPTOP EXTRAS DRIVER | |||
937 | P: Corentin Chary | 936 | P: Corentin Chary |
938 | M: corentincj@iksaif.net | 937 | M: corentincj@iksaif.net |
939 | L: acpi4asus-user@lists.sourceforge.net | 938 | L: acpi4asus-user@lists.sourceforge.net |
940 | W: http://sourceforge.net/projects/acpi4asus | 939 | W: http://acpi4asus.sf.net |
941 | W: http://xf.iksaif.net/acpi4asus | ||
942 | S: Maintained | 940 | S: Maintained |
943 | F: drivers/platform/x86/asus-laptop.c | 941 | F: drivers/platform/x86/asus-laptop.c |
944 | 942 | ||
@@ -2117,7 +2115,7 @@ EEEPC LAPTOP EXTRAS DRIVER | |||
2117 | P: Corentin Chary | 2115 | P: Corentin Chary |
2118 | M: corentincj@iksaif.net | 2116 | M: corentincj@iksaif.net |
2119 | L: acpi4asus-user@lists.sourceforge.net | 2117 | L: acpi4asus-user@lists.sourceforge.net |
2120 | W: http://sourceforge.net/projects/acpi4asus | 2118 | W: http://acpi4asus.sf.net |
2121 | S: Maintained | 2119 | S: Maintained |
2122 | F: drivers/platform/x86/eeepc-laptop.c | 2120 | F: drivers/platform/x86/eeepc-laptop.c |
2123 | 2121 | ||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 5613483db141..06806559c8c3 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -62,12 +62,12 @@ config ASUS_LAPTOP | |||
62 | ---help--- | 62 | ---help--- |
63 | This is the new Linux driver for Asus laptops. It may also support some | 63 | This is the new Linux driver for Asus laptops. It may also support some |
64 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate | 64 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate |
65 | standard ACPI events that go through /proc/acpi/events. It also adds | 65 | standard ACPI events and input events. It also adds |
66 | support for video output switching, LCD backlight control, Bluetooth and | 66 | support for video output switching, LCD backlight control, Bluetooth and |
67 | Wlan control, and most importantly, allows you to blink those fancy LEDs. | 67 | Wlan control, and most importantly, allows you to blink those fancy LEDs. |
68 | 68 | ||
69 | For more information and a userspace daemon for handling the extra | 69 | For more information and a userspace daemon for handling the extra |
70 | buttons see <http://acpi4asus.sf.net/>. | 70 | buttons see <http://acpi4asus.sf.net>. |
71 | 71 | ||
72 | If you have an ACPI-compatible ASUS laptop, say Y or M here. | 72 | If you have an ACPI-compatible ASUS laptop, say Y or M here. |
73 | 73 | ||
@@ -359,7 +359,10 @@ config EEEPC_LAPTOP | |||
359 | select HWMON | 359 | select HWMON |
360 | ---help--- | 360 | ---help--- |
361 | This driver supports the Fn-Fx keys on Eee PC laptops. | 361 | This driver supports the Fn-Fx keys on Eee PC laptops. |
362 | It also adds the ability to switch camera/wlan on/off. | 362 | |
363 | It also gives access to some extra laptop functionalities like | ||
364 | Bluetooth, backlight and allows powering on/off some other | ||
365 | devices. | ||
363 | 366 | ||
364 | If you have an Eee PC laptop, say Y or M here. | 367 | If you have an Eee PC laptop, say Y or M here. |
365 | 368 | ||
@@ -407,7 +410,7 @@ config ACPI_ASUS | |||
407 | parameters. | 410 | parameters. |
408 | 411 | ||
409 | More information and a userspace daemon for handling the extra buttons | 412 | More information and a userspace daemon for handling the extra buttons |
410 | at <http://sourceforge.net/projects/acpi4asus/>. | 413 | at <http://acpi4asus.sf.net>. |
411 | 414 | ||
412 | If you have an ACPI-compatible ASUS laptop, say Y or M here. This | 415 | If you have an ACPI-compatible ASUS laptop, say Y or M here. This |
413 | driver is still under development, so if your laptop is unsupported or | 416 | driver is still under development, so if your laptop is unsupported or |