diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-06-03 22:36:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-06-11 19:13:45 -0400 |
commit | 197a2cd907e3a5278a1cfd48c86402133f38a9ba (patch) | |
tree | 4b43a9eb51c126e1e40e712281bdb3111bdd2d2d | |
parent | dcb84f335bee9c9a7781cfc5d74492dccaf066d2 (diff) |
thinkpad-acpi: SW_RADIO to SW_RFKILL_ALL rename
Rename SW_RADIO to SW_RFKILL_ALL in thinkpad-acpi code and docs, following
5adad0133907790c50283bf03271d920d6897043 "Input: rename SW_RADIO to
SW_RFKILL_ALL".
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 2 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 01c6c3d8a7e3..64b3f146e4b0 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
@@ -503,7 +503,7 @@ generate input device EV_KEY events. | |||
503 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW | 503 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW |
504 | events for switches: | 504 | events for switches: |
505 | 505 | ||
506 | SW_RADIO T60 and later hardare rfkill rocker switch | 506 | SW_RFKILL_ALL T60 and later hardare rfkill rocker switch |
507 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A | 507 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A |
508 | 508 | ||
509 | Non hot-key ACPI HKEY event map: | 509 | Non hot-key ACPI HKEY event map: |
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index a0ce0b2fa03e..f81e048c9872 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -1293,7 +1293,7 @@ static void tpacpi_input_send_radiosw(void) | |||
1293 | mutex_lock(&tpacpi_inputdev_send_mutex); | 1293 | mutex_lock(&tpacpi_inputdev_send_mutex); |
1294 | 1294 | ||
1295 | input_report_switch(tpacpi_inputdev, | 1295 | input_report_switch(tpacpi_inputdev, |
1296 | SW_RADIO, !!wlsw); | 1296 | SW_RFKILL_ALL, !!wlsw); |
1297 | input_sync(tpacpi_inputdev); | 1297 | input_sync(tpacpi_inputdev); |
1298 | 1298 | ||
1299 | mutex_unlock(&tpacpi_inputdev_send_mutex); | 1299 | mutex_unlock(&tpacpi_inputdev_send_mutex); |
@@ -2199,7 +2199,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) | |||
2199 | 2199 | ||
2200 | if (tp_features.hotkey_wlsw) { | 2200 | if (tp_features.hotkey_wlsw) { |
2201 | set_bit(EV_SW, tpacpi_inputdev->evbit); | 2201 | set_bit(EV_SW, tpacpi_inputdev->evbit); |
2202 | set_bit(SW_RADIO, tpacpi_inputdev->swbit); | 2202 | set_bit(SW_RFKILL_ALL, tpacpi_inputdev->swbit); |
2203 | } | 2203 | } |
2204 | if (tp_features.hotkey_tablet) { | 2204 | if (tp_features.hotkey_tablet) { |
2205 | set_bit(EV_SW, tpacpi_inputdev->evbit); | 2205 | set_bit(EV_SW, tpacpi_inputdev->evbit); |