releases/upstream/2.6.26-rc6/0001-thinkpad-acpi-SW_RADIO-to-SW_RFKILL_ALL-rename.patch

   1 From 197a2cd907e3a5278a1cfd48c86402133f38a9ba Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Tue, 3 Jun 2008 23:36:09 -0300
   4 Subject: thinkpad-acpi: SW_RADIO to SW_RFKILL_ALL rename
   5
   6 Rename SW_RADIO to SW_RFKILL_ALL in thinkpad-acpi code and docs, following
   7 5adad0133907790c50283bf03271d920d6897043 "Input: rename SW_RADIO to
   8 SW_RFKILL_ALL".
   9
  10 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  11 Signed-off-by: Len Brown <len.brown@intel.com>
  12 ---
  13  Documentation/laptops/thinkpad-acpi.txt |    2 +-
  14  drivers/misc/thinkpad_acpi.c            |    4 ++--
  15  2 files changed, 3 insertions(+), 3 deletions(-)
  16
  17 diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
  18 index 01c6c3d..64b3f14 100644
  19 --- a/Documentation/laptops/thinkpad-acpi.txt
  20 +++ b/Documentation/laptops/thinkpad-acpi.txt
  21 @@ -503,7 +503,7 @@ generate input device EV_KEY events.
  22  In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW
  23  events for switches:
  24
  25 -SW_RADIO       T60 and later hardare rfkill rocker switch
  26 +SW_RFKILL_ALL  T60 and later hardare rfkill rocker switch
  27  SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A
  28
  29  Non hot-key ACPI HKEY event map:
  30 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  31 index a0ce0b2..f81e048 100644
  32 --- a/drivers/misc/thinkpad_acpi.c
  33 +++ b/drivers/misc/thinkpad_acpi.c
  34 @@ -1293,7 +1293,7 @@ static void tpacpi_input_send_radiosw(void)
  35                 mutex_lock(&tpacpi_inputdev_send_mutex);
  36
  37                 input_report_switch(tpacpi_inputdev,
  38 -                                   SW_RADIO, !!wlsw);
  39 +                                   SW_RFKILL_ALL, !!wlsw);
  40                 input_sync(tpacpi_inputdev);
  41
  42                 mutex_unlock(&tpacpi_inputdev_send_mutex);
  43 @@ -2199,7 +2199,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
  44
  45                 if (tp_features.hotkey_wlsw) {
  46                         set_bit(EV_SW, tpacpi_inputdev->evbit);
  47 -                       set_bit(SW_RADIO, tpacpi_inputdev->swbit);
  48 +                       set_bit(SW_RFKILL_ALL, tpacpi_inputdev->swbit);
  49                 }
  50                 if (tp_features.hotkey_tablet) {
  51                         set_bit(EV_SW, tpacpi_inputdev->evbit);
  52 --
  53 1.5.5.3
  54