Commit d13a90752db1a5c146239646caa4878799fd8f48
1 parent
00f5e098a1
Exists in
master
arm:omap:am335x: fix incorrect #ifdef usage
This patch removes the remaining #ifdef. using #ifdef may cause trouble while building modules but without checking _MODULE config option Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Showing 1 changed file with 0 additions and 9 deletions Side-by-side Diff
arch/arm/mach-omap2/board-am335xevm.c
| ... | ... | @@ -600,7 +600,6 @@ |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | /* Matrix GPIO Keypad Support for profile-0 only: TODO */ |
| 603 | -#ifdef CONFIG_KEYBOARD_MATRIX | |
| 604 | 603 | |
| 605 | 604 | /* pinmux for keypad device */ |
| 606 | 605 | static struct pinmux_config matrix_keypad_pin_mux[] = { |
| 607 | 606 | |
| ... | ... | @@ -665,10 +664,7 @@ |
| 665 | 664 | pr_err("failed to register matrix keypad (2x3) device\n"); |
| 666 | 665 | } |
| 667 | 666 | } |
| 668 | -#endif | |
| 669 | 667 | |
| 670 | - | |
| 671 | -#ifdef CONFIG_KEYBOARD_GPIO | |
| 672 | 668 | /* pinmux for keypad device */ |
| 673 | 669 | static struct pinmux_config volume_keys_pin_mux[] = { |
| 674 | 670 | {"spi0_sclk.gpio0_2", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
| ... | ... | @@ -718,7 +714,6 @@ |
| 718 | 714 | if (err) |
| 719 | 715 | pr_err("failed to register matrix keypad (2x3) device\n"); |
| 720 | 716 | } |
| 721 | -#endif | |
| 722 | 717 | |
| 723 | 718 | /* |
| 724 | 719 | * @evm_id - evm id which needs to be configured |
| 725 | 720 | |
| 726 | 721 | |
| ... | ... | @@ -1393,12 +1388,8 @@ |
| 1393 | 1388 | PROFILE_5)}, |
| 1394 | 1389 | {wl12xx_init, DEV_ON_BASEBOARD, (PROFILE_0 | PROFILE_3 | PROFILE_5)}, |
| 1395 | 1390 | {d_can_init, DEV_ON_DGHTR_BRD, PROFILE_1}, |
| 1396 | -#ifdef CONFIG_KEYBOARD_MATRIX | |
| 1397 | 1391 | {matrix_keypad_init, DEV_ON_DGHTR_BRD, PROFILE_0}, |
| 1398 | -#endif | |
| 1399 | -#ifdef CONFIG_KEYBOARD_GPIO | |
| 1400 | 1392 | {volume_keys_init, DEV_ON_DGHTR_BRD, PROFILE_0}, |
| 1401 | -#endif | |
| 1402 | 1393 | {NULL, 0, 0}, |
| 1403 | 1394 | }; |
| 1404 | 1395 |