diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-28 19:25:21 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-08-28 19:25:21 +0200 |
| commit | 9d5e88bcdd8d814a65dfeb6b55a5a7cef61630d4 (patch) | |
| tree | 34b174bbb23518864c5555938d0cafe4fcd89d86 | |
| parent | 4eb57c98b8d2a812441b33911ca3cf9602699654 (diff) | |
| parent | 9662e0802445a1f56cef11bbd0d520b07238424a (diff) | |
| download | linux-9d5e88bcdd8d814a65dfeb6b55a5a7cef61630d4.tar.gz linux-9d5e88bcdd8d814a65dfeb6b55a5a7cef61630d4.tar.bz2 linux-9d5e88bcdd8d814a65dfeb6b55a5a7cef61630d4.zip | |
Merge branch 'wan' into release-2.6.27
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 11 | ||||
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 02dc748b76c4..71f0fe1fc1b0 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -44,7 +44,7 @@ detailed description): - LCD brightness control - Volume control - 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 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 would be the safest choice, though). -EXPERIMENTAL: WAN ------------------ +WAN +--- procfs: /proc/acpi/ibm/wan sysfs device attribute: wwan_enable (deprecated) 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 Wireless EV-DO) device. diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index d3eb7903c346..6b9300779a43 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = { .read = wan_read, .write = wan_write, .exit = wan_exit, - .flags.experimental = 1, }; /************************************************************************* |