diff options
| author | Greg Kroah-Hartman | 2014-12-06 17:17:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-12-06 17:17:24 +0100 |
| commit | dd63af108f0814f0b589659f4e55a7a5af3b7e53 (patch) | |
| tree | 0a7679fecb5b516cddb2153c632a4262899be6c3 /drivers/mfd/stmpe.h | |
| parent | serial: pxa: hold port.lock when reporting modem line changes (diff) | |
| parent | Linux 3.18-rc7 (diff) | |
| download | kernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.gz kernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.xz kernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.zip | |
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/stmpe.h')
| -rw-r--r-- | drivers/mfd/stmpe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h index 2d045f26f193..bee0abf82040 100644 --- a/drivers/mfd/stmpe.h +++ b/drivers/mfd/stmpe.h @@ -269,7 +269,7 @@ int stmpe_remove(struct stmpe *stmpe); #define STMPE24XX_REG_CHIP_ID 0x80 #define STMPE24XX_REG_IEGPIOR_LSB 0x18 #define STMPE24XX_REG_ISGPIOR_MSB 0x19 -#define STMPE24XX_REG_GPMR_LSB 0xA5 +#define STMPE24XX_REG_GPMR_LSB 0xA4 #define STMPE24XX_REG_GPSR_LSB 0x85 #define STMPE24XX_REG_GPCR_LSB 0x88 #define STMPE24XX_REG_GPDR_LSB 0x8B |