diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 11:30:50 -0500 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 11:30:50 -0500 |
| commit | cd15c51d6c2f577f896471a058f33a95f164dba2 (patch) | |
| tree | 9d42b8ea581ca35bdf75467b8bbbab21e7056ff9 /drivers/input/misc/adxl34x.c | |
| parent | 5b8314a98888b12159d0b1b14982b8dd2d94e3f5 (diff) | |
| parent | 130f769e81fc472beb2211320777e26050e3fa15 (diff) | |
Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
v3.10. Turns out I also removed some display related mux code,
so let's revert that except for the dead code parts.
* tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)
Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
+Linux 3.13-rc4
Diffstat (limited to 'drivers/input/misc/adxl34x.c')
| -rw-r--r-- | drivers/input/misc/adxl34x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index 0735de3a6468..1cb1da294419 100644 --- a/drivers/input/misc/adxl34x.c +++ b/drivers/input/misc/adxl34x.c | |||
| @@ -158,7 +158,7 @@ | |||
| 158 | 158 | ||
| 159 | /* ORIENT ADXL346 only */ | 159 | /* ORIENT ADXL346 only */ |
| 160 | #define ADXL346_2D_VALID (1 << 6) | 160 | #define ADXL346_2D_VALID (1 << 6) |
| 161 | #define ADXL346_2D_ORIENT(x) (((x) & 0x3) >> 4) | 161 | #define ADXL346_2D_ORIENT(x) (((x) & 0x30) >> 4) |
| 162 | #define ADXL346_3D_VALID (1 << 3) | 162 | #define ADXL346_3D_VALID (1 << 3) |
| 163 | #define ADXL346_3D_ORIENT(x) ((x) & 0x7) | 163 | #define ADXL346_3D_ORIENT(x) ((x) & 0x7) |
| 164 | #define ADXL346_2D_PORTRAIT_POS 0 /* +X */ | 164 | #define ADXL346_2D_PORTRAIT_POS 0 /* +X */ |