diff --git a/[refs] b/[refs]
index a58e84f0d43e..eba9ea652559 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 501a5250589be41c4c060afa855bc60b4539a340
+refs/heads/master: 5adad0133907790c50283bf03271d920d6897043
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 28a094fcfe20..e075c4b762fb 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/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)