aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/gp2a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/misc/gp2a.c')
-rwxr-xr-xdrivers/input/misc/gp2a.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/misc/gp2a.c b/drivers/input/misc/gp2a.c
index 8bd70db..4ea7cde 100755
--- a/drivers/input/misc/gp2a.c
+++ b/drivers/input/misc/gp2a.c
@@ -382,7 +382,6 @@ static int gp2a_setup_irq(struct gp2a_data *gp2a)
return rc;
}
-#ifndef CONFIG_SAMSUNG_FASCINATE
rc = gpio_direction_input(pdata->p_out);
if (rc < 0) {
pr_err("%s: failed to set gpio %d as input (%d)\n",
@@ -391,9 +390,6 @@ static int gp2a_setup_irq(struct gp2a_data *gp2a)
}
irq = gpio_to_irq(pdata->p_out);
-#else
- irq = pdata->p_irq;
-#endif
rc = request_threaded_irq(irq, NULL,
gp2a_irq_handler,
@@ -419,9 +415,7 @@ static int gp2a_setup_irq(struct gp2a_data *gp2a)
goto done;
err_request_irq:
-#ifndef CONFIG_SAMSUNG_FASCINATE
err_gpio_direction_input:
-#endif
gpio_free(pdata->p_out);
done:
return rc;