diff options
-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): | |||
44 | - LCD brightness control | 44 | - LCD brightness control |
45 | - Volume control | 45 | - Volume control |
46 | - Fan control and monitoring: fan speed, fan enable/disable | 46 | - Fan control and monitoring: fan speed, fan enable/disable |
47 | - Experimental: WAN enable and disable | 47 | - WAN enable and disable |
48 | 48 | ||
49 | A compatibility table by model and feature is maintained on the web | 49 | A compatibility table by model and feature is maintained on the web |
50 | site, http://ibm-acpi.sf.net/. I appreciate any success or failure | 50 | 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 | would be the safest choice, though). | 1375 | would be the safest choice, though). |
1376 | 1376 | ||
1377 | 1377 | ||
1378 | EXPERIMENTAL: WAN | 1378 | WAN |
1379 | ----------------- | 1379 | --- |
1380 | 1380 | ||
1381 | procfs: /proc/acpi/ibm/wan | 1381 | procfs: /proc/acpi/ibm/wan |
1382 | sysfs device attribute: wwan_enable (deprecated) | 1382 | sysfs device attribute: wwan_enable (deprecated) |
1383 | sysfs rfkill class: switch "tpacpi_wwan_sw" | 1383 | sysfs rfkill class: switch "tpacpi_wwan_sw" |
1384 | 1384 | ||
1385 | This feature is marked EXPERIMENTAL because the implementation | ||
1386 | directly accesses hardware registers and may not work as expected. USE | ||
1387 | WITH CAUTION! To use this feature, you need to supply the | ||
1388 | experimental=1 parameter when loading the module. | ||
1389 | |||
1390 | This feature shows the presence and current state of a W-WAN (Sierra | 1385 | This feature shows the presence and current state of a W-WAN (Sierra |
1391 | Wireless EV-DO) device. | 1386 | Wireless EV-DO) device. |
1392 | 1387 | ||
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 = { | |||
3086 | .read = wan_read, | 3086 | .read = wan_read, |
3087 | .write = wan_write, | 3087 | .write = wan_write, |
3088 | .exit = wan_exit, | 3088 | .exit = wan_exit, |
3089 | .flags.experimental = 1, | ||
3090 | }; | 3089 | }; |
3091 | 3090 | ||
3092 | /************************************************************************* | 3091 | /************************************************************************* |