diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/misc/acer-wmi.c | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index f01ac9a07bf5..47c6be84fc84 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -875,7 +875,7 @@ config SONYPI | |||
| 875 | Device which can be found in many (all ?) Sony Vaio laptops. | 875 | Device which can be found in many (all ?) Sony Vaio laptops. |
| 876 | 876 | ||
| 877 | If you have one of those laptops, read | 877 | If you have one of those laptops, read |
| 878 | <file:Documentation/sonypi.txt>, and say Y or M here. | 878 | <file:Documentation/laptops/sonypi.txt>, and say Y or M here. |
| 879 | 879 | ||
| 880 | To compile this driver as a module, choose M here: the | 880 | To compile this driver as a module, choose M here: the |
| 881 | module will be called sonypi. | 881 | module will be called sonypi. |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index c143a86c2ea6..1abc95ca9dfa 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -114,6 +114,9 @@ config ACER_WMI | |||
| 114 | wireless radio and bluetooth control, and on some laptops, | 114 | wireless radio and bluetooth control, and on some laptops, |
| 115 | exposes the mail LED and LCD backlight. | 115 | exposes the mail LED and LCD backlight. |
| 116 | 116 | ||
| 117 | For more information about this driver see | ||
| 118 | <file:Documentation/laptops/acer-wmi.txt> | ||
| 119 | |||
| 117 | If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M | 120 | If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M |
| 118 | here. | 121 | here. |
| 119 | 122 | ||
| @@ -152,8 +155,9 @@ config FUJITSU_LAPTOP | |||
| 152 | If you have a Fujitsu laptop, say Y or M here. | 155 | If you have a Fujitsu laptop, say Y or M here. |
| 153 | 156 | ||
| 154 | config TC1100_WMI | 157 | config TC1100_WMI |
| 155 | tristate "HP Compaq TC1100 Tablet WMI Extras" | 158 | tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)" |
| 156 | depends on X86 && !X86_64 | 159 | depends on X86 && !X86_64 |
| 160 | depends on EXPERIMENTAL | ||
| 157 | depends on ACPI | 161 | depends on ACPI |
| 158 | select ACPI_WMI | 162 | select ACPI_WMI |
| 159 | ---help--- | 163 | ---help--- |
| @@ -192,7 +196,7 @@ config SONY_LAPTOP | |||
| 192 | screen brightness control, Fn keys and allows powering on/off some | 196 | screen brightness control, Fn keys and allows powering on/off some |
| 193 | devices. | 197 | devices. |
| 194 | 198 | ||
| 195 | Read <file:Documentation/sony-laptop.txt> for more information. | 199 | Read <file:Documentation/laptops/sony-laptop.txt> for more information. |
| 196 | 200 | ||
| 197 | config SONYPI_COMPAT | 201 | config SONYPI_COMPAT |
| 198 | bool "Sonypi compatibility" | 202 | bool "Sonypi compatibility" |
| @@ -211,8 +215,9 @@ config THINKPAD_ACPI | |||
| 211 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds | 215 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds |
| 212 | support for Fn-Fx key combinations, Bluetooth control, video | 216 | support for Fn-Fx key combinations, Bluetooth control, video |
| 213 | output switching, ThinkLight control, UltraBay eject and more. | 217 | output switching, ThinkLight control, UltraBay eject and more. |
| 214 | For more information about this driver see | 218 | For more information about this driver see |
| 215 | <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . | 219 | <file:Documentation/laptops/thinkpad-acpi.txt> and |
| 220 | <http://ibm-acpi.sf.net/> . | ||
| 216 | 221 | ||
| 217 | This driver was formerly known as ibm-acpi. | 222 | This driver was formerly known as ibm-acpi. |
| 218 | 223 | ||
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index a4d677504250..d7aea93081f2 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c | |||
| @@ -428,11 +428,9 @@ static acpi_status AMW0_set_u32(u32 value, u32 cap, struct wmi_interface *iface) | |||
| 428 | if (value > max_brightness) | 428 | if (value > max_brightness) |
| 429 | return AE_BAD_PARAMETER; | 429 | return AE_BAD_PARAMETER; |
| 430 | switch (quirks->brightness) { | 430 | switch (quirks->brightness) { |
| 431 | case 1: | ||
| 432 | return ec_write(0x83, value); | ||
| 433 | default: | 431 | default: |
| 434 | return AE_BAD_ADDRESS; | 432 | return ec_write(0x83, value); |
| 435 | break; | 433 | break; |
| 436 | } | 434 | } |
| 437 | default: | 435 | default: |
| 438 | return AE_BAD_ADDRESS; | 436 | return AE_BAD_ADDRESS; |
