Merge branch 'master' of git://git.denx.de/u-boot-imx

[karo-tx-uboot.git] / board / samsung / common / misc.c

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 8766f0ca0684948877b28bcec64177c6b51530b0..4538ac7f2a2fc2d2a91f840944d13ec542e35e11 100644 (file)
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -14,7 +14,6 @@
 #include <malloc.h>
 #include <linux/sizes.h>
 #include <asm/arch/cpu.h>
-#include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/input.h>
 #include <power/pmic.h>
@@ -412,6 +411,8 @@ void check_boot_mode(void)
 void keys_init(void)
 {
        /* Set direction to input */
+       gpio_request(KEY_VOL_UP_GPIO, "volume-up");
+       gpio_request(KEY_VOL_DOWN_GPIO, "volume-down");
        gpio_direction_input(KEY_VOL_UP_GPIO);
        gpio_direction_input(KEY_VOL_DOWN_GPIO);
 }