Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / tosakbd.c

diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c
index 94e444b4ee1523c4539b687383eaa9c35a52fcfe..44cb50af3ce973616517d3aca4147ecdf16d4361 100644 (file)
--- a/drivers/input/keyboard/tosakbd.c
+++ b/drivers/input/keyboard/tosakbd.c
@@ -19,8 +19,8 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/tosa.h>
+#include <mach/gpio.h>
+#include <mach/tosa.h>
 
 #define KB_ROWMASK(r)          (1 << (r))
 #define SCANCODE(r, c)         (((r)<<4) + (c) + 1)
@@ -215,8 +215,6 @@ static int tosakbd_suspend(struct platform_device *dev, pm_message_t state)
        unsigned long flags;
 
        spin_lock_irqsave(&tosakbd->lock, flags);
-       PGSR1 = (PGSR1 & ~TOSA_GPIO_LOW_STROBE_BIT);
-       PGSR2 = (PGSR2 & ~TOSA_GPIO_HIGH_STROBE_BIT);
        tosakbd->suspended = 1;
        spin_unlock_irqrestore(&tosakbd->lock, flags);