diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-13 02:34:25 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-13 02:34:25 -0400 |
| commit | 88ce3c3ca3df754e8a2a63b01c38bd1667fcae70 (patch) | |
| tree | f8c76e8d306d59862f28dfc1b3bab1e3bb171a8f /drivers/input/keyboard | |
| parent | 62f548d0c2d2418e39b8e4b7ec39b5ca2ef4380d (diff) | |
| parent | 46146e7d4b383d5b34014d072553498c7cd52821 (diff) | |
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) | |||
| 122 | 122 | ||
| 123 | /* Enable interrupts */ | 123 | /* Enable interrupts */ |
| 124 | keypad->int_mask = 1 << 1; | 124 | keypad->int_mask = 1 << 1; |
| 125 | writel(keypad->int_mask, keypad->reg_base + 0xc); | 125 | writel(keypad->int_mask, keypad->reg_base + KEYPAD_INTMSK); |
| 126 | 126 | ||
| 127 | /* Disable GPIO interrupts to prevent hanging on touchpad */ | 127 | /* Disable GPIO interrupts to prevent hanging on touchpad */ |
| 128 | /* Possibly used to detect touchpad events */ | 128 | /* Possibly used to detect touchpad events */ |