diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-30 10:17:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-30 10:17:19 -0700 |
commit | 7536d7be7b718f8c5834cbcb7601816562e1b805 (patch) | |
tree | b9dd93b06bc2542465f67cf73851941f1bbc641b /include | |
parent | 57f50ca127a3189566af0d6378394c75a26f0f7e (diff) | |
parent | 5adad0133907790c50283bf03271d920d6897043 (diff) | |
download | kernel_samsung_espresso10-7536d7be7b718f8c5834cbcb7601816562e1b805.zip kernel_samsung_espresso10-7536d7be7b718f8c5834cbcb7601816562e1b805.tar.gz kernel_samsung_espresso10-7536d7be7b718f8c5834cbcb7601816562e1b805.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: rename SW_RADIO to SW_RFKILL_ALL
Input: gtco - fix double kfree in error handling path
Input: pxa27x_keypad - miscellaneous fixes
Input: atkbd - mark keyboard as disabled when suspending/unloading
Input: apanel - remove duplicate include
Input: wm9713 - support five wire panels
Input: wm97xx-core - fix race on PHY init
Input: wm97xx-core - fix driver name
Input: wm97xx-core - report a phys for WM97xx touchscreens
Input: i8042 - make sure Dritek quirk is invoked at resume
Input: i8042 - add Dritek quirk for Acer TravelMate 660
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/input.h | 4 | ||||
-rw-r--r-- | include/linux/wm97xx.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 28a094f..e075c4b 100644 --- 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) diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h index 4d13732..6f69968 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 */ |