Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755538Ab3DWLJX (ORCPT ); Tue, 23 Apr 2013 07:09:23 -0400 Received: from mga11.intel.com ([192.55.52.93]:11691 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755348Ab3DWLJV (ORCPT ); Tue, 23 Apr 2013 07:09:21 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,533,1363158000"; d="scan'208";a="326791353" From: Artem Bityutskiy To: Dmitry Torokhov Cc: Linux Kernel Maling List , linux-input@vger.kernel.org, Ulf Hofemeier , Hui Wang Subject: [PATCH] input: egalax_ts: remove bogus OF dependency Date: Tue, 23 Apr 2013 14:09:17 +0300 Message-Id: <1366715357-9392-1-git-send-email-artem.bityutskiy@linux.intel.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1366708088.9823.16.camel@sauron.fi.intel.com> References: <1366708088.9823.16.camel@sauron.fi.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1707 Lines: 49 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 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/