提交 9d5e88bc 编写于 作者: A Andi Kleen

Merge branch 'wan' into release-2.6.27

...@@ -44,7 +44,7 @@ detailed description): ...@@ -44,7 +44,7 @@ detailed description):
- LCD brightness control - LCD brightness control
- Volume control - Volume control
- Fan control and monitoring: fan speed, fan enable/disable - Fan control and monitoring: fan speed, fan enable/disable
- Experimental: WAN enable and disable - WAN enable and disable
A compatibility table by model and feature is maintained on the web A compatibility table by model and feature is maintained on the web
site, http://ibm-acpi.sf.net/. I appreciate any success or failure site, http://ibm-acpi.sf.net/. I appreciate any success or failure
...@@ -1375,18 +1375,13 @@ with EINVAL, try to set pwm1_enable to 1 and pwm1 to at least 128 (255 ...@@ -1375,18 +1375,13 @@ with EINVAL, try to set pwm1_enable to 1 and pwm1 to at least 128 (255
would be the safest choice, though). would be the safest choice, though).
EXPERIMENTAL: WAN WAN
----------------- ---
procfs: /proc/acpi/ibm/wan procfs: /proc/acpi/ibm/wan
sysfs device attribute: wwan_enable (deprecated) sysfs device attribute: wwan_enable (deprecated)
sysfs rfkill class: switch "tpacpi_wwan_sw" sysfs rfkill class: switch "tpacpi_wwan_sw"
This feature is marked EXPERIMENTAL because the implementation
directly accesses hardware registers and may not work as expected. USE
WITH CAUTION! To use this feature, you need to supply the
experimental=1 parameter when loading the module.
This feature shows the presence and current state of a W-WAN (Sierra This feature shows the presence and current state of a W-WAN (Sierra
Wireless EV-DO) device. Wireless EV-DO) device.
......
...@@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = { ...@@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = {
.read = wan_read, .read = wan_read,
.write = wan_write, .write = wan_write,
.exit = wan_exit, .exit = wan_exit,
.flags.experimental = 1,
}; };
/************************************************************************* /*************************************************************************
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册