From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Linux Kernel Maling List <linux-kernel@vger.kernel.org>,
linux-input@vger.kernel.org,
Ulf Hofemeier <ulf.hofemeier@intel.com>,
Hui Wang <jason77.wang@gmail.com>
Subject: [PATCH] input: egalax_ts: remove bogus OF dependency
Date: Tue, 23 Apr 2013 14:09:17 +0300 [thread overview]
Message-ID: <1366715357-9392-1-git-send-email-artem.bityutskiy@linux.intel.com> (raw)
In-Reply-To: <1366708088.9823.16.camel@sauron.fi.intel.com>
There are platforms using this driver which do not have OF. However, commit
ae495e844a77344fdaedbb2ad97d925d096e9f0d added a Kconfig dependency on OF and
broke OF-less setups.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: stable@vger.kernel.org [v3.7+]
---
drivers/input/touchscreen/Kconfig | 2 +-
drivers/input/touchscreen/egalax_ts.c | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 515cfe7..d53b0d6 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -227,7 +227,7 @@ config TOUCHSCREEN_EETI
config TOUCHSCREEN_EGALAX
tristate "EETI eGalax multi-touch panel support"
- depends on I2C && OF
+ depends on I2C
help
Say Y here to enable support for I2C connected EETI
eGalax multi-touch panels.
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 17c9097..b984cfc 100644
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -287,10 +287,12 @@ static int egalax_ts_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume);
+#ifdef CONFIG_OF
static struct of_device_id egalax_ts_dt_ids[] = {
{ .compatible = "eeti,egalax_ts" },
{ /* sentinel */ }
};
+#endif
static struct i2c_driver egalax_ts_driver = {
.driver = {
--
1.7.7
next prev parent reply other threads:[~2013-04-23 11:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 9:08 eGalax touchscreen regression Artem Bityutskiy
2013-04-23 11:09 ` Artem Bityutskiy [this message]
2013-04-23 15:37 ` [PATCH] input: egalax_ts: remove bogus OF dependency Dmitry Torokhov
2013-04-24 5:58 ` Artem Bityutskiy
2013-04-23 15:40 ` eGalax touchscreen regression Dmitry Torokhov
2013-04-24 6:06 ` Artem Bityutskiy
2013-04-24 9:03 ` Artem Bityutskiy
2013-04-26 14:59 ` Arnd Bergmann
2013-04-26 15:09 ` Artem Bityutskiy
2013-04-26 15:39 ` Dmitry Torokhov
2013-04-26 16:03 ` Artem Bityutskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366715357-9392-1-git-send-email-artem.bityutskiy@linux.intel.com \
--to=artem.bityutskiy@linux.intel.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jason77.wang@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ulf.hofemeier@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).