[PATCH] fix migor_ts dependency and compile warning

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This patch adds I2C dependencies to the MigoR touchscreen driver,
and while at it kills off a compile warning.

Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
---

 Applies to the git input tree b92b4853a19498f17ae802b382e3deee8cb01bc8.

 drivers/input/touchscreen/Kconfig    |    2 +-
 drivers/input/touchscreen/migor_ts.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- 0001/drivers/input/touchscreen/Kconfig
+++ work/drivers/input/touchscreen/Kconfig	2008-05-15 19:42:16.000000000 +0900
@@ -148,7 +148,7 @@ config TOUCHSCREEN_PENMOUNT
 
 config TOUCHSCREEN_MIGOR
 	tristate "Renesas MIGO-R touchscreen"
-	depends on SH_MIGOR
+	depends on SH_MIGOR && I2C
 	help
 	  Say Y here to enable MIGO-R touchscreen support.
 
--- 0001/drivers/input/touchscreen/migor_ts.c
+++ work/drivers/input/touchscreen/migor_ts.c	2008-05-15 19:41:37.000000000 +0900
@@ -144,7 +144,8 @@ static void migor_ts_close(struct input_
 	enable_irq(priv->irq);
 }
 
-static int migor_ts_probe(struct i2c_client *client)
+static int migor_ts_probe(struct i2c_client *client,
+			  const struct i2c_device_id *idp)
 {
 	struct migor_ts_priv *priv;
 	struct input_dev *input;
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux