2 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index af9c6314153b..3e86b61d2e4c 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -639,7 +639,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)
 
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h
index 4d13732e9cf0..6f69968eab24 100644
--- a/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h
@@ -100,6 +100,7 @@
 #define WM9713_ADCSEL_Y         0x0004  /* Y measurement */
 #define WM9713_ADCSEL_PRES      0x0008  /* Pressure measurement */
 #define WM9713_COO              0x0001  /* enable coordinate mode */
+#define WM9713_45W              0x1000  /* set for 5 wire panel */
 #define WM9713_PDEN             0x0800  /* measure only when pen down */
 #define WM9713_ADCSEL_MASK      0x00fe  /* ADC selection mask */
 #define WM9713_WAIT             0x0200  /* coordinate wait */