Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit c55c452a6881b2560e8490ee346a87eb9e092075

Authored by Goutam Kumar
Committed by Hebbar, Gururaja
1 parent 0088903287
Exists in master

arm:omap:am335x: fix incorrect #ifdef usage 

Remove incorrect #ifdef added from a prev commit.

while we are here, also move <linux/input.h> upwards before any input
or key related macros are used.

Signed-off-by: Goutam Kumar <goutam.kumar@ti.com>
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>

Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff

arch/arm/mach-omap2/board-am335xevm.c
Diff comments   View file @ c55c452
... ... @@ -20,13 +20,9 @@
20 20 #include <linux/gpio.h>
21 21 #include <linux/spi/spi.h>
22 22 #include <linux/spi/flash.h>
23   -#ifdef CONFIG_KEYBOARD_GPIO
24   -#include <linux/gpio_keys.h>
25   -#endif
26   -#ifdef CONFIG_KEYBOARD_MATRIX
27 23 #include <linux/input.h>
  24 +#include <linux/gpio_keys.h>
28 25 #include <linux/input/matrix_keypad.h>
29   -#endif
30 26 #include <linux/mtd/mtd.h>
31 27 #include <linux/mtd/nand.h>
32 28 #include <linux/mtd/partitions.h>