Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[~andy/linux] / drivers / input / keyboard / omap-keypad.c

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 2bda5f0b9c6ec8cd6e3b281dbc0fc1ccaf2bdf4d..4a5fcc8026f5630670f03cfdde498721eb55d97c 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -37,7 +37,7 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 
 #undef NEW_BOARD_LEARNING_MODE
 
@@ -179,7 +179,7 @@ static void omap_kp_tasklet(unsigned long data)
        memcpy(keypad_state, new_state, sizeof(keypad_state));
 
        if (key_down) {
-                int delay = HZ / 20;
+               int delay = HZ / 20;
                /* some key is pressed - keep irq disabled and use timer
                 * to poll the keypad */
                if (spurious)
@@ -346,9 +346,9 @@ err4:
 err3:
        device_remove_file(&pdev->dev, &dev_attr_enable);
 err2:
-       for (i = row_idx - 1; i >=0; i--)
+       for (i = row_idx - 1; i >= 0; i--)
                gpio_free(row_gpios[i]);
-       for (i = col_idx - 1; i >=0; i--)
+       for (i = col_idx - 1; i >= 0; i--)
                gpio_free(col_gpios[i]);
 
        kfree(omap_kp);