From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the input tree with the input-current tree Date: Thu, 2 Sep 2010 11:59:58 +1000 Message-ID: <20100902115958.982d7618.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:35620 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752145Ab0IBCAE (ORCPT ); Wed, 1 Sep 2010 22:00:04 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Dmitry Torokhov Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kevin Wells Hi Dmitry, Today's linux-next merge of the input tree got a conflict in drivers/input/touchscreen/Makefile between commit 948e90e22f01287302d84b5b8d4ba330a41dbf8a ("Input: mrst-touchscreen - move out of staging") from the input-current tree and commit 3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a ("Input: add LPC32xx touchscreen controller driver") from the input tree. Just overlapping additions. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/input/touchscreen/Makefile index 9061042,22e2d59..0000000 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@@ -23,7 -23,7 +23,8 @@@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o +obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o + obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o