From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kevin Wells <wellsk40@gmail•com>
Subject: linux-next: manual merge of the input tree with the input-current tree
Date: Thu, 2 Sep 2010 11:59:58 +1000 [thread overview]
Message-ID: <20100902115958.982d7618.sfr@canb.auug.org.au> (raw)
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
next reply other threads:[~2010-09-02 2:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 1:59 Stephen Rothwell [this message]
2010-09-02 2:46 ` linux-next: manual merge of the input tree with the input-current tree Dmitry Torokhov
2010-09-02 4:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-03-17 2:27 Stephen Rothwell
2017-02-09 2:06 Stephen Rothwell
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=20100902115958.982d7618.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wellsk40@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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