Merge branch 'master' into for_mm

[linux-2.6-omap-h63xx.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 28a094fcfe201f0a05a344011f338cf7c3c7dc72..e075c4b762fb367e0a3ad07227c440cb7500629e 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -637,7 +637,9 @@ struct input_absinfo {
 #define SW_LID                 0x00  /* set = lid shut */
 #define SW_TABLET_MODE         0x01  /* set = tablet mode */
 #define SW_HEADPHONE_INSERT    0x02  /* set = inserted */
-#define SW_RADIO               0x03  /* set = radio enabled */
+#define SW_RFKILL_ALL          0x03  /* rfkill master switch, type "any"
+                                        set = radio enabled */
+#define SW_RADIO               SW_RFKILL_ALL   /* deprecated */
 #define SW_MAX                 0x0f
 #define SW_CNT                 (SW_MAX+1)