commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=8d145fbe5c760d928360aa6b09947f4d4adeb555
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk

Reviewed-by: Mike Frysinger <[email protected]>
Signed-off-by: Michael Hennerich <[email protected]>
---
 drivers/input/misc/Kconfig          |    2 +-
 drivers/input/misc/adux1001-vibra.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 782a5db..ae5bf58 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -469,7 +469,7 @@ config INPUT_XEN_KBDDEV_FRONTEND
 
 config INPUT_ADUX1001_VIBRA
 	tristate "ADUX1001 Smart Electromagnetic Actuator Haptic Driver"
-	depends on I2C
+	depends on I2C && HAVE_PWM
 	select INPUT_FF_MEMLESS
 	help
 	  This option enables support for the Analog Devices ADUX1001
diff --git a/drivers/input/misc/adux1001-vibra.c b/drivers/input/misc/adux1001-vibra.c
index dded58f..5e234a5 100644
--- a/drivers/input/misc/adux1001-vibra.c
+++ b/drivers/input/misc/adux1001-vibra.c
@@ -460,7 +460,7 @@ static int __devinit adux1001_probe(struct i2c_client *client,
 	if (!chip->input) {
 		dev_err(&client->dev, "input device allocation failed\n");
 		ret = -ENOMEM;
-		goto err_release_pwm ;
+		goto err_release_pwm;
 	}
 
 	input_set_drvdata(chip->input, chip);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to