diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /drivers/input | |
| parent | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (diff) | |
| parent | 938870491f0cad030b358af47e28d124b72702d1 (diff) | |
Merge branch 'pxa-tosa' into pxa
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/tosakbd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c index 94e444b4ee15..b12b7ee4b6aa 100644 --- a/drivers/input/keyboard/tosakbd.c +++ b/drivers/input/keyboard/tosakbd.c | |||
| @@ -215,8 +215,6 @@ static int tosakbd_suspend(struct platform_device *dev, pm_message_t state) | |||
| 215 | unsigned long flags; | 215 | unsigned long flags; |
| 216 | 216 | ||
| 217 | spin_lock_irqsave(&tosakbd->lock, flags); | 217 | spin_lock_irqsave(&tosakbd->lock, flags); |
| 218 | PGSR1 = (PGSR1 & ~TOSA_GPIO_LOW_STROBE_BIT); | ||
| 219 | PGSR2 = (PGSR2 & ~TOSA_GPIO_HIGH_STROBE_BIT); | ||
| 220 | tosakbd->suspended = 1; | 218 | tosakbd->suspended = 1; |
| 221 | spin_unlock_irqrestore(&tosakbd->lock, flags); | 219 | spin_unlock_irqrestore(&tosakbd->lock, flags); |
| 222 | 220 | ||