diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-07-04 22:22:00 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-04 22:31:28 -0400 |
| commit | 2456689b3b11ddecc091cd5f00b9adea6a9854cf (patch) | |
| tree | 506c0754343ded58fd2b9d8716f9bc17f0b5e7f5 /include/linux/wm97xx.h | |
| parent | 5f098ecd4288333d87e2293239fab1c13ec90dae (diff) | |
Input: wm97xx - remove redundant define
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/wm97xx.h')
| -rw-r--r-- | include/linux/wm97xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h index 38e8c4d9289e..10b9e614fccd 100644 --- a/include/linux/wm97xx.h +++ b/include/linux/wm97xx.h | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #define WM97XX_ADCSEL_X 0x1000 /* x coord measurement */ | 38 | #define WM97XX_ADCSEL_X 0x1000 /* x coord measurement */ |
| 39 | #define WM97XX_ADCSEL_Y 0x2000 /* y coord measurement */ | 39 | #define WM97XX_ADCSEL_Y 0x2000 /* y coord measurement */ |
| 40 | #define WM97XX_ADCSEL_PRES 0x3000 /* pressure measurement */ | 40 | #define WM97XX_ADCSEL_PRES 0x3000 /* pressure measurement */ |
| 41 | #define WM97XX_ADCSEL_MASK 0x7000 | 41 | #define WM97XX_ADCSEL_MASK 0x7000 /* ADC selection mask */ |
| 42 | #define WM97XX_COO 0x0800 /* enable coordinate mode */ | 42 | #define WM97XX_COO 0x0800 /* enable coordinate mode */ |
| 43 | #define WM97XX_CTC 0x0400 /* enable continuous mode */ | 43 | #define WM97XX_CTC 0x0400 /* enable continuous mode */ |
| 44 | #define WM97XX_CM_RATE_93 0x0000 /* 93.75Hz continuous rate */ | 44 | #define WM97XX_CM_RATE_93 0x0000 /* 93.75Hz continuous rate */ |
| @@ -61,7 +61,6 @@ | |||
| 61 | #define WM97XX_PRP_DET_DIG 0xc000 /* setect on, digitise on */ | 61 | #define WM97XX_PRP_DET_DIG 0xc000 /* setect on, digitise on */ |
| 62 | #define WM97XX_RPR 0x2000 /* wake up on pen down */ | 62 | #define WM97XX_RPR 0x2000 /* wake up on pen down */ |
| 63 | #define WM97XX_PEN_DOWN 0x8000 /* pen is down */ | 63 | #define WM97XX_PEN_DOWN 0x8000 /* pen is down */ |
| 64 | #define WM97XX_ADCSRC_MASK 0x7000 /* ADC source mask */ | ||
| 65 | 64 | ||
| 66 | #define WM97XX_AUX_ID1 0x8001 | 65 | #define WM97XX_AUX_ID1 0x8001 |
| 67 | #define WM97XX_AUX_ID2 0x8002 | 66 | #define WM97XX_AUX_ID2 0x8002 |