diff options
| author | Dmitry Torokhov | 2013-07-13 08:34:25 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2013-07-13 08:34:25 +0200 |
| commit | 88ce3c3ca3df754e8a2a63b01c38bd1667fcae70 (patch) | |
| tree | f8c76e8d306d59862f28dfc1b3bab1e3bb171a8f /drivers/input/keyboard | |
| parent | Input: cyttsp4 - use 16bit address for I2C/SPI communication (diff) | |
| parent | Input: nspire-keypad - replace magic offset with define (diff) | |
| download | kernel-qcow2-linux-88ce3c3ca3df754e8a2a63b01c38bd1667fcae70.tar.gz kernel-qcow2-linux-88ce3c3ca3df754e8a2a63b01c38bd1667fcae70.tar.xz kernel-qcow2-linux-88ce3c3ca3df754e8a2a63b01c38bd1667fcae70.zip | |
Merge branch 'next' into for-linus
Bring in second round of updates for 3.11.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/nspire-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/nspire-keypad.c b/drivers/input/keyboard/nspire-keypad.c index e0a1339e40e6..20d872d6f603 100644 --- a/drivers/input/keyboard/nspire-keypad.c +++ b/drivers/input/keyboard/nspire-keypad.c @@ -122,7 +122,7 @@ static int nspire_keypad_chip_init(struct nspire_keypad *keypad) /* Enable interrupts */ keypad->int_mask = 1 << 1; - writel(keypad->int_mask, keypad->reg_base + 0xc); + writel(keypad->int_mask, keypad->reg_base + KEYPAD_INTMSK); /* Disable GPIO interrupts to prevent hanging on touchpad */ /* Possibly used to detect touchpad events */ |